After Mirta ColorLib Integration.

3 files changed, 26 insertions, 29 deletions

diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp b/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp
index d8abe700f..1295b3488 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/ColorConverter.cpp
@@ -1085,7 +1085,7 @@ void Tango::ColorLib::ColorConverter::ConvertColorToLinearInks(ConversionInput*
 		}
 		break;
 	}
-	case(COLOR_SPACE__Coats):
+	case(COLOR_SPACE__Catalog):
 	{
 		int32_t inData;
 		if (conversionInput->inputcoordinates->has_pantoncode)
@@ -1304,7 +1304,7 @@ void Tango::ColorLib::ColorConverter::ConvertVolumeToRGBDisplay(ConversionInput*
 	double *LinInkP = new double[m_nA2BnSepIn];
 	double NormFactor =100/ m_ProcessRangesMaxP[m_nProcessRanges - 1];
 
-	if (conversionInput->colorspace == COLOR_SPACE__Twine)
+	if (conversionInput->colorspace == COLOR_SPACE__Catalog)
 	{
 		for (int i = 0; i < m_nB2AnSepOut; ++i)
 		{
@@ -1543,7 +1543,7 @@ size_t Tango::ColorLib::ColorConverter::Convert(uint8_t * input_buffer, size_t i
 	m_nVolumes = m_nB2AnSepOut;
 	int GamutRegion = 0;
 		//Convert input data to linear inks
-	if (conversionInput->colorspace == COLOR_SPACE__Volume  || conversionInput->colorspace == COLOR_SPACE__Twine)
+	if (conversionInput->colorspace == COLOR_SPACE__Volume  || conversionInput->colorspace == COLOR_SPACE__Catalog)
 	{
 		ConvertVolumeToRGBDisplay(conversionInput, Volume, RGBOut, LabOut, GamutRegion);
 		InGamut = true;
@@ -2443,26 +2443,26 @@ size_t Tango::ColorLib::ColorConverter::P_IsInGamut(uint8_t * input_buffer, size
 		}
 		case(COLOR_SPACE__CMYK):
 		case(COLOR_SPACE__Volume):
-		case(COLOR_SPACE__Twine):
+		case(COLOR_SPACE__Catalog):
 		{//no conversion
 		 //missing from structure light inks or special colors
 		 //	just convert Lab for rgb display	
 			InGamut = true;
 		}
-		case(COLOR_SPACE__Coats):
-		{
-			int32_t inData;
-			if (conversionInput->inputcoordinates->has_pantoncode)
-				inData = conversionInput->inputcoordinates->pantoncode;
-			else
-			{
-				//mismatch between color space and data
-				throw std::exception("Mismatch between color space and data");
-				return(0);
-			}
-			break;
-			//missing calclulation method and pantone table, either in terms of RGB or CMY or Lab
-		}
+		//case(COLOR_SPACE__Catalog):
+		//{
+		//	int32_t inData;
+		//	if (conversionInput->inputcoordinates->has_pantoncode)
+		//		inData = conversionInput->inputcoordinates->pantoncode;
+		//	else
+		//	{
+		//		//mismatch between color space and data
+		//		throw std::exception("Mismatch between color space and data");
+		//		return(0);
+		//	}
+		//	break;
+		//	//missing calclulation method and pantone table, either in terms of RGB or CMY or Lab
+		//}
 		default:
 		{
 			throw std::exception(" Unsupported Color Space");
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.c b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.c
index 78cae4462..8ea22ca90 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.c
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.c
@@ -7,25 +7,23 @@
 #endif
 
 #include "ColorSpace.pb-c.h"
-static const ProtobufCEnumValue color_space__enum_values_by_number[6] =
+static const ProtobufCEnumValue color_space__enum_values_by_number[5] =
 {
   { "Volume", "COLOR_SPACE__Volume", 0 },
   { "RGB", "COLOR_SPACE__RGB", 1 },
   { "CMYK", "COLOR_SPACE__CMYK", 2 },
   { "LAB", "COLOR_SPACE__LAB", 3 },
-  { "Coats", "COLOR_SPACE__Coats", 4 },
-  { "Twine", "COLOR_SPACE__Twine", 5 },
+  { "Catalog", "COLOR_SPACE__Catalog", 4 },
 };
 static const ProtobufCIntRange color_space__value_ranges[] = {
-{0, 0},{0, 6}
+{0, 0},{0, 5}
 };
-static const ProtobufCEnumValueIndex color_space__enum_values_by_name[6] =
+static const ProtobufCEnumValueIndex color_space__enum_values_by_name[5] =
 {
   { "CMYK", 2 },
-  { "Coats", 4 },
+  { "Catalog", 4 },
   { "LAB", 3 },
   { "RGB", 1 },
-  { "Twine", 5 },
   { "Volume", 0 },
 };
 const ProtobufCEnumDescriptor color_space__descriptor =
@@ -35,9 +33,9 @@ const ProtobufCEnumDescriptor color_space__descriptor =
   "ColorSpace",
   "ColorSpace",
   "",
-  6,
+  5,
   color_space__enum_values_by_number,
-  6,
+  5,
   color_space__enum_values_by_name,
   1,
   color_space__value_ranges,
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.h b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.h
index 17bfb420f..defb93aa2 100644
--- a/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.h
+++ b/Software/Visual_Studio/Native/Tango.ColorLib/PMR/ColorLab/ColorSpace.pb-c.h
@@ -24,8 +24,7 @@ typedef enum _ColorSpace {
   COLOR_SPACE__RGB = 1,
   COLOR_SPACE__CMYK = 2,
   COLOR_SPACE__LAB = 3,
-  COLOR_SPACE__Coats = 4,
-  COLOR_SPACE__Twine = 5
+  COLOR_SPACE__Catalog = 4
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(COLOR_SPACE)
 } ColorSpace;