Merge pull request #4 from kablammyman/master

fixed the ColorRegression for loop bug, as well as added #defines for…

EtcLib/Etc/Etc.h

@@ -21,6 +21,10 @@
 #include "EtcColor.h"
 #include "EtcErrorMetric.h"
 
+#define ETCCOMP_MIN_EFFORT_LEVEL (0.0f)
+#define ETCCOMP_DEFAULT_EFFORT_LEVEL (40.0f)
+#define ETCCOMP_MAX_EFFORT_LEVEL (100.0f)
+
 namespace Etc
 {
 	class Block4x4EncodingBits;

EtcLib/Etc/EtcImage.cpp

@@ -220,15 +220,15 @@ namespace Etc
 			return m_encodingStatus;
 		}
 
-		if (m_fEffort < 0.0f)
+		if (m_fEffort < ETCCOMP_MIN_EFFORT_LEVEL)
 		{
 			AddToEncodingStatus(WARNING_EFFORT_OUT_OF_RANGE);
-			m_fEffort = 0.0f;
+			m_fEffort = ETCCOMP_MIN_EFFORT_LEVEL;
 		}
-		else if (m_fEffort > 100.0f)
+		else if (m_fEffort > ETCCOMP_MAX_EFFORT_LEVEL)
 		{
 			AddToEncodingStatus(WARNING_EFFORT_OUT_OF_RANGE);
-			m_fEffort = 100.0f;
+			m_fEffort = ETCCOMP_MAX_EFFORT_LEVEL;
 		}
 		if (a_uiJobs < 1)
 		{
@@ -276,7 +276,7 @@ namespace Etc
 		}
 
 		// perform effort-based encoding
-		if (m_fEffort > 0.0f)
+		if (m_fEffort > ETCCOMP_MIN_EFFORT_LEVEL)
 		{
 			unsigned int uiFinishedBlocks = 0;
 			unsigned int uiTotalEffortBlocks = static_cast<unsigned int>(roundf(0.01f * m_fEffort  * GetNumberOfBlocks()));

EtcLib/EtcCodec/EtcBlock4x4Encoding_RGB8.cpp

@@ -1715,9 +1715,10 @@ namespace Etc
 			{
 				afX[uiPixel] = (float)uiPixel;
 				afY[uiPixel] = paf4Pixels[uiPixel].f[uiComponent];
-				Etc::Regression(afX, afY, a_uiPixels, 
-								&(pf4Slope->f[uiComponent]), &(pf4Offset->f[uiComponent]));
+
 			}
+			Etc::Regression(afX, afY, a_uiPixels,
+				&(pf4Slope->f[uiComponent]), &(pf4Offset->f[uiComponent]));
 		}
 
 	}

EtcTool/EtcTool.cpp

@@ -79,7 +79,7 @@ class Commands
 		{
 			apstrCompareFilename[uiComparison] = nullptr;
 		}
-		fEffort = 40.0f;
+		fEffort = ETCCOMP_DEFAULT_EFFORT_LEVEL;
 		//Rec. 709 or BT.709...the default
 		e_ErrMetric = ErrorMetric::BT709;
 		uiJobs = MIN_JOBS;