diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-05-16 11:57:27 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-05-16 11:57:27 +0300 |
| commit | fe19ef2694d92c91a493b9f3d1f41bc57ebbe6a2 (patch) | |
| tree | c32b7b4f77e76ce8ae0e9061d0ead2ce0a5de09f /Software/Visual_Studio | |
| parent | e7e90c8ec976b9bc2357e2be6abac43e4479ef2d (diff) | |
| download | Tango-fe19ef2694d92c91a493b9f3d1f41bc57ebbe6a2.tar.gz Tango-fe19ef2694d92c91a493b9f3d1f41bc57ebbe6a2.zip | |
Worked on Mirta code.
Diffstat (limited to 'Software/Visual_Studio')
| -rw-r--r-- | Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj | 8 | ||||
| -rw-r--r-- | Software/Visual_Studio/Native/Tester/Tester.cpp | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj index 5c6433c3f..7e560ed90 100644 --- a/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj +++ b/Software/Visual_Studio/Native/Tango.ColorLib/Tango.ColorLib.vcxproj @@ -36,8 +36,8 @@ <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <PlatformToolset>v141</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> + <WholeProgramOptimization>false</WholeProgramOptimization> + <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> @@ -80,7 +80,8 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <LinkIncremental>false</LinkIncremental> - <OutDir>$(SolutionDir)Build\Release</OutDir> + <OutDir>$(SolutionDir)Build\Release\</OutDir> + <IncludePath>$(ProjectDir);$(IncludePath)</IncludePath> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <LinkIncremental>false</LinkIncremental> @@ -132,6 +133,7 @@ <SubSystem>Windows</SubSystem> <EnableCOMDATFolding>true</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> + <AssemblyDebug>true</AssemblyDebug> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> 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; |