From 9724b4d936a47b7bbaca82bda900442ef3f439d1 Mon Sep 17 00:00:00 2001 From: Person Date: Wed, 22 May 2019 20:34:08 -0700 Subject: [PATCH] --Code changes -Formatting. --- Source/Ember/XmlToEmber.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Ember/XmlToEmber.cpp b/Source/Ember/XmlToEmber.cpp index 0962fb8..5b42a0c 100644 --- a/Source/Ember/XmlToEmber.cpp +++ b/Source/Ember/XmlToEmber.cpp @@ -1198,7 +1198,7 @@ bool XmlToEmber::ParseEmberElementFromChaos(xmlNode* emberNode, Ember& cur { if (!Compare(childNode->name, "imaging")) { - std::string bgstr, useHighlightPower; + std::string bgstr, useHighlightPower; for (auto imgChildNode = childNode->children; imgChildNode; imgChildNode = imgChildNode->next) { @@ -1211,7 +1211,7 @@ bool XmlToEmber::ParseEmberElementFromChaos(xmlNode* emberNode, Ember& cur else if (ParseAndAssignContent(imgChildNode, "name", "brightness", currentEmber.m_Brightness)) {} else if (ParseAndAssignContent(imgChildNode, "name", "flam3_gamma", currentEmber.m_Gamma)) {} else if (ParseAndAssignContent(imgChildNode, "name", "flam3_vibrancy", currentEmber.m_Vibrancy)) {} - else if (ParseAndAssignContent(imgChildNode, "name", "flam3_use_highlight_power", useHighlightPower)) {} + else if (ParseAndAssignContent(imgChildNode, "name", "flam3_use_highlight_power", useHighlightPower)) {} else if (ParseAndAssignContent(imgChildNode, "name", "flam3_highlight_power", currentEmber.m_HighlightPower)) {} else if (ParseAndAssignContent(imgChildNode, "name", "flam3_gamma_linear_threshold", currentEmber.m_GammaThresh)) {} else if (ParseAndAssignContent(imgChildNode, "name", "background_colour", bgstr)) @@ -1225,11 +1225,11 @@ bool XmlToEmber::ParseEmberElementFromChaos(xmlNode* emberNode, Ember& cur } } - // there is no warranty that flam3_use_highlight_power will be read before flam3_highlight_power. So, better to be here. - bool bVal; istringstream istr(useHighlightPower); istr >> std::boolalpha >> bVal; + // there is no warranty that flam3_use_highlight_power will be read before flam3_highlight_power. So, better to be here. + bool bVal; istringstream istr(useHighlightPower); istr >> std::boolalpha >> bVal; - if(!bVal && !istr.bad() && !istr.fail()) - currentEmber.m_HighlightPower = T(-1); + if (!bVal && !istr.bad() && !istr.fail()) + currentEmber.m_HighlightPower = T(-1); if (auto curvesnode = GetChildNodeByNodeName(childNode, "curves")) { @@ -1341,7 +1341,7 @@ bool XmlToEmber::ParseEmberElementFromChaos(xmlNode* emberNode, Ember& cur { istringstream istr(pos); istr >> currentEmber.m_CenterX >> currentEmber.m_CenterY; - currentEmber.m_CenterY *= -1; + currentEmber.m_CenterY *= -1; currentEmber.m_RotCenterY = currentEmber.m_CenterY; } else