diff options
Diffstat (limited to 'Software/Visual_Studio/Native/Tester/Tester.cpp')
| -rw-r--r-- | Software/Visual_Studio/Native/Tester/Tester.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Software/Visual_Studio/Native/Tester/Tester.cpp b/Software/Visual_Studio/Native/Tester/Tester.cpp index e498cb75c..652008585 100644 --- a/Software/Visual_Studio/Native/Tester/Tester.cpp +++ b/Software/Visual_Studio/Native/Tester/Tester.cpp @@ -11,8 +11,6 @@ #include "OutputCoordinates.pb-c.h" #include "OutputLiquid.pb-c.h" #include "InputLiquid.pb-c.h" -#include "LiquidType.pb-c.h" -#include "ColorConverter.h" #include "Exports.h" size_t ReadCalData(char *name, double **&CalData, long &nCalData); @@ -24,7 +22,7 @@ size_t InitData(uint8_t *&input_buffer, long &buffersize, char *ForwardName, cha ConversionInput *conversionInput = (ConversionInput*)malloc(sizeof(ConversionInput)); conversion_input__init(conversionInput);//CONVERSION_INPUT__INIT; //fill conversionInput - conversionInput->colorspace = COLOR_SPACE__Volume; + conversionInput->colorspace = COLOR_SPACE__RGB; conversionInput->has_colorspace = true; conversionInput->has_forwarddata = true; conversionInput->has_inversedata = true; @@ -256,16 +254,16 @@ size_t ReadCalData(char *name, double **&CalData, long &nCalData) int main() { char *ForwardName = new char[256]; - strcpy_s(ForwardName, 256, "C:\\Mirta\\Matlab\\A2B_Lin.bin"); + strcpy_s(ForwardName, 256, "..\\..\\..\\ColorData\\CCT\\A2B_Lin.cct"); char *InverseName = new char[256]; - strcpy_s(InverseName, 256, "C:\\Mirta\\Matlab\\B2A_Lin.bin"); + strcpy_s(InverseName, 256, "..\\..\\..\\ColorData\\CCT\\B2A_Lin.cct"); char *CalCyanName = new char[256]; - strcpy_s(CalCyanName, 256, "C:\\Mirta\\Matlab\\CalCurves\\CyanToLinear.bin"); + strcpy_s(CalCyanName, 256, "..\\..\\..\\ColorData\\CAT\\CyanToLinear.cat"); char *CalMagentaName = new char[256]; - strcpy_s(CalMagentaName, 256, "C:\\Mirta\\Matlab\\CalCurves\\MagentaToLinear.bin"); + strcpy_s(CalMagentaName, 256, "..\\..\\..\\ColorData\\CAT\\MagentaToLinear.cat"); char *CalYellowName = new char[256]; - strcpy_s(CalYellowName, 256, "C:\\Mirta\\Matlab\\CalCurves\\YellowToLinear.bin"); + strcpy_s(CalYellowName, 256, "..\\..\\..\\ColorData\\CAT\\YellowToLinear.cat"); uint8_t *input_buffer = NULL; long bufferSize = 0; |