From e922fa50cdf9a58f40cad07553bcaa2883d3c5bf Mon Sep 17 00:00:00 2001 From: Howard Good Date: Mon, 31 Aug 2015 12:33:05 -0700 Subject: [PATCH] Add vc14 project and solution files --- image/decode/strdec.c | 12 +- image/vc14projects/CommonLib_vc14.vcxproj | 191 ++++++++++++++++++ image/vc14projects/DecodeLib_vc14.vcxproj | 185 ++++++++++++++++++ image/vc14projects/EncodeLib_vc14.vcxproj | 183 +++++++++++++++++ jxrencoderdecoder/JXRDec420_vc14.vcxproj | 227 ++++++++++++++++++++++ jxrencoderdecoder/JXRDecApp_vc14.vcxproj | 224 +++++++++++++++++++++ jxrencoderdecoder/JXREnc420_vc14.vcxproj | 227 ++++++++++++++++++++++ jxrencoderdecoder/JXREncApp_vc14.vcxproj | 222 +++++++++++++++++++++ jxrencoderdecoder/JXR_vc14.sln | 105 ++++++++++ jxrgluelib/JXRGlueLib_vc14.vcxproj | 178 +++++++++++++++++ jxrtestlib/JXRTestLib_vc14.vcxproj | 179 +++++++++++++++++ jxrtestlib/JXRTestTif.c | 10 +- 12 files changed, 1932 insertions(+), 11 deletions(-) create mode 100644 image/vc14projects/CommonLib_vc14.vcxproj create mode 100644 image/vc14projects/DecodeLib_vc14.vcxproj create mode 100644 image/vc14projects/EncodeLib_vc14.vcxproj create mode 100644 jxrencoderdecoder/JXRDec420_vc14.vcxproj create mode 100644 jxrencoderdecoder/JXRDecApp_vc14.vcxproj create mode 100644 jxrencoderdecoder/JXREnc420_vc14.vcxproj create mode 100644 jxrencoderdecoder/JXREncApp_vc14.vcxproj create mode 100644 jxrencoderdecoder/JXR_vc14.sln create mode 100644 jxrgluelib/JXRGlueLib_vc14.vcxproj create mode 100644 jxrtestlib/JXRTestLib_vc14.vcxproj diff --git a/image/decode/strdec.c b/image/decode/strdec.c index f926c7e..83ef03a 100644 --- a/image/decode/strdec.c +++ b/image/decode/strdec.c @@ -1664,9 +1664,9 @@ Int outputMBRow(CWMImageStrCodec * pSC) #define fixupFullSize(type, nCh) \ for(iRow = iFirstRow; iRow < cHeight; iRow ++) {\ - size_t iY;\ - for(iColumn = iFirstColumn, iY = pOffsetY[iRow]; iColumn < cWidth; iColumn ++){\ - type *pT = (type*)(U8 *)pSC->WMIBI.pv + iY + pOffsetX[iColumn];\ + size_t iOffsetY;\ + for(iColumn = iFirstColumn, iOffsetY = pOffsetY[iRow]; iColumn < cWidth; iColumn ++){\ + type *pT = (type*)(U8 *)pSC->WMIBI.pv + iOffsetY + pOffsetX[iColumn];\ pT[2] = pT[1] = pT[0]; \ pT += nCh; \ } \ @@ -2389,9 +2389,9 @@ Int decodeThumbnail(CWMImageStrCodec * pSC) #define fixupThumb(type, nCh) \ for(iRow = iFirstRow; iRow < cHeight; iRow += tScale) {\ - size_t iY;\ - for(iColumn = iFirstColumn, iY = pOffsetY[iRow >> nBits]; iColumn < cWidth; iColumn += tScale){\ - type *pT = (type*)((U8 *)pSC->WMIBI.pv + pOffsetX[iColumn >> nBits] + iY);\ + size_t iOffsetY;\ + for(iColumn = iFirstColumn, iOffsetY = pOffsetY[iRow >> nBits]; iColumn < cWidth; iColumn += tScale){\ + type *pT = (type*)((U8 *)pSC->WMIBI.pv + pOffsetX[iColumn >> nBits] + iOffsetY);\ pT[iB] = pT[1] = pT[iR]; \ } \ } \ diff --git a/image/vc14projects/CommonLib_vc14.vcxproj b/image/vc14projects/CommonLib_vc14.vcxproj new file mode 100644 index 0000000..06f8fca --- /dev/null +++ b/image/vc14projects/CommonLib_vc14.vcxproj @@ -0,0 +1,191 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + JXRCommonLib + {4B4C055C-170E-4DCF-8F73-BED91BE7CFA4} + CommonLib + Win32Proj + + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(Configuration)/$(ProjectName)\ + $(OutDir) + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + $(Configuration)/$(ProjectName)\ + $(OutDir) + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir)$(ProjectName).pdb + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + X64 + + + Disabled + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir)$(ProjectName).pdb + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + MaxSpeed + true + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;ENABLE_OPTIMIZATIONS;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + + + /LTCG %(AdditionalOptions) + $(OutDir)$(ProjectName).lib + true + + + + + X64 + + + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;ENABLE_OPTIMIZATIONS;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).lib + true + + + + + + + true + true + true + true + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/image/vc14projects/DecodeLib_vc14.vcxproj b/image/vc14projects/DecodeLib_vc14.vcxproj new file mode 100644 index 0000000..a292249 --- /dev/null +++ b/image/vc14projects/DecodeLib_vc14.vcxproj @@ -0,0 +1,185 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + JXRDecodeLib + {F3DED308-7A6F-4B9F-8EDF-AF99DEC8BDE3} + DecodeLib + Win32Proj + + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(Configuration)/$(ProjectName)\ + $(OutDir) + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + $(Configuration)/$(ProjectName)\ + $(OutDir) + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir)$(ProjectName).pdb + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + X64 + + + Disabled + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir)$(ProjectName).pdb + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + MaxSpeed + true + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;ENABLE_OPTIMIZATIONS;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + + + /LTCG %(AdditionalOptions) + $(OutDir)$(ProjectName).lib + true + + + + + X64 + + + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;ENABLE_OPTIMIZATIONS;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).lib + true + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/image/vc14projects/EncodeLib_vc14.vcxproj b/image/vc14projects/EncodeLib_vc14.vcxproj new file mode 100644 index 0000000..e3eaa7d --- /dev/null +++ b/image/vc14projects/EncodeLib_vc14.vcxproj @@ -0,0 +1,183 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + JXREncodeLib + {F99F7B19-47A6-4677-94F2-93C12CF1FB97} + EncodeLib + Win32Proj + + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(Configuration)/$(ProjectName)\ + $(OutDir) + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + $(Configuration)/$(ProjectName)\ + $(OutDir) + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir)$(ProjectName).pdb + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + X64 + + + Disabled + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + $(IntDir)$(ProjectName).pdb + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + MaxSpeed + true + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;ENABLE_OPTIMIZATIONS;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + + + /LTCG %(AdditionalOptions) + $(OutDir)$(ProjectName).lib + true + + + + + X64 + + + ..\sys;..\..\Network\client\debughlp\memtrace;..\x86;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;ENABLE_OPTIMIZATIONS;DISABLE_PERF_MEASUREMENT;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).lib + true + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jxrencoderdecoder/JXRDec420_vc14.vcxproj b/jxrencoderdecoder/JXRDec420_vc14.vcxproj new file mode 100644 index 0000000..ecb9767 --- /dev/null +++ b/jxrencoderdecoder/JXRDec420_vc14.vcxproj @@ -0,0 +1,227 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {492EF19B-E3F2-4D0F-99FF-FEBC73DD4F7F} + Win32Proj + JXRDec420 + + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(Configuration)/$(ProjectName)\ + $(OutDir) + true + $(Configuration)/$(ProjectName)\ + $(OutDir) + false + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + true + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + EditAndContinue + + + $(OutDir)$(ProjectName).exe + true + $(OutDir)$(ProjectName).pdb + Console + MachineX86 + + + + + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).exe + true + Console + true + true + MachineX86 + UseLinkTimeCodeGeneration + + + + + X64 + + + Disabled + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).exe + true + $(OutDir)$(ProjectName).pdb + Console + MachineX64 + + + + + X64 + + + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).exe + true + Console + true + true + MachineX64 + UseLinkTimeCodeGeneration + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + {4b4c055c-170e-4dcf-8f73-bed91be7cfa4} + true + false + false + true + false + + + {f3ded308-7a6f-4b9f-8edf-af99dec8bde3} + true + false + false + true + false + + + {f99f7b19-47a6-4677-94f2-93c12cf1fb97} + true + false + false + true + false + + + {a69603cc-65e8-443f-8e31-737dbd6bb0db} + + + {a69603cc-65e8-443f-8e31-737dbd6bb0dc} + + + + + + \ No newline at end of file diff --git a/jxrencoderdecoder/JXRDecApp_vc14.vcxproj b/jxrencoderdecoder/JXRDecApp_vc14.vcxproj new file mode 100644 index 0000000..463a502 --- /dev/null +++ b/jxrencoderdecoder/JXRDecApp_vc14.vcxproj @@ -0,0 +1,224 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {472FCCAF-BDFE-4F36-BEEF-09C242F4A98A} + Win32Proj + JXRDecApp + + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(Configuration)/$(ProjectName)\ + $(OutDir) + true + $(Configuration)/$(ProjectName)\ + $(OutDir) + false + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + true + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + EditAndContinue + + + $(OutDir)$(ProjectName).exe + true + $(OutDir)$(ProjectName).pdb + Console + MachineX86 + + + + + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).exe + true + $(OutDir)$(ProjectName).pdb + Console + true + true + MachineX86 + UseLinkTimeCodeGeneration + + + + + X64 + + + Disabled + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).exe + true + $(OutDir)$(ProjectName).pdb + Console + MachineX64 + + + + + X64 + + + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).exe + true + $(OutDir)$(ProjectName).pdb + Console + true + true + MachineX64 + UseLinkTimeCodeGeneration + + + + + + + + {4b4c055c-170e-4dcf-8f73-bed91be7cfa4} + true + false + false + true + false + + + {f3ded308-7a6f-4b9f-8edf-af99dec8bde3} + true + false + false + true + false + + + {f99f7b19-47a6-4677-94f2-93c12cf1fb97} + true + false + false + true + false + + + {a69603cc-65e8-443f-8e31-737dbd6bb0db} + + + {a69603cc-65e8-443f-8e31-737dbd6bb0dc} + + + + + + \ No newline at end of file diff --git a/jxrencoderdecoder/JXREnc420_vc14.vcxproj b/jxrencoderdecoder/JXREnc420_vc14.vcxproj new file mode 100644 index 0000000..a9d0279 --- /dev/null +++ b/jxrencoderdecoder/JXREnc420_vc14.vcxproj @@ -0,0 +1,227 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {CE29E199-10D5-4BC0-B9D7-76580A44FCBE} + Win32Proj + JXREnc420 + + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(Configuration)/$(ProjectName)\ + $(OutDir) + true + $(Configuration)/$(ProjectName)\ + $(OutDir) + false + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + true + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + EditAndContinue + + + $(OutDir)$(ProjectName).exe + true + $(OutDir)$(ProjectName).pdb + Console + MachineX86 + + + + + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).exe + true + Console + true + true + MachineX86 + UseLinkTimeCodeGeneration + + + + + X64 + + + Disabled + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).exe + true + $(OutDir)$(ProjectName).pdb + Console + MachineX64 + + + + + X64 + + + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).exe + true + Console + true + true + MachineX64 + UseLinkTimeCodeGeneration + + + + + CompileAsCpp + CompileAsCpp + CompileAsCpp + CompileAsCpp + + + + + {4b4c055c-170e-4dcf-8f73-bed91be7cfa4} + true + false + false + true + false + + + {f3ded308-7a6f-4b9f-8edf-af99dec8bde3} + true + false + false + true + false + + + {f99f7b19-47a6-4677-94f2-93c12cf1fb97} + true + false + false + true + false + + + {a69603cc-65e8-443f-8e31-737dbd6bb0db} + + + {a69603cc-65e8-443f-8e31-737dbd6bb0dc} + + + + + + \ No newline at end of file diff --git a/jxrencoderdecoder/JXREncApp_vc14.vcxproj b/jxrencoderdecoder/JXREncApp_vc14.vcxproj new file mode 100644 index 0000000..80bfddd --- /dev/null +++ b/jxrencoderdecoder/JXREncApp_vc14.vcxproj @@ -0,0 +1,222 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FCC17C5C-51B5-44CA-9D70-6C8384AE86E6} + Win32Proj + JXREncApp + + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + Application + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + $(Configuration)/$(ProjectName)\ + $(OutDir) + true + $(Configuration)/$(ProjectName)\ + $(OutDir) + false + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + true + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + false + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + EditAndContinue + + + $(OutDir)$(ProjectName).exe + true + $(OutDir)$(ProjectName).pdb + Console + MachineX86 + + + + + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).exe + true + Console + true + true + MachineX86 + UseLinkTimeCodeGeneration + + + + + X64 + + + Disabled + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).exe + true + $(OutDir)$(ProjectName).pdb + Console + MachineX64 + + + + + X64 + + + ..\JXRTestLib;..\JXRGlueLib;..\image\sys;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).exe + true + Console + true + true + MachineX64 + UseLinkTimeCodeGeneration + + + + + + + + {4b4c055c-170e-4dcf-8f73-bed91be7cfa4} + true + false + false + true + false + + + {f3ded308-7a6f-4b9f-8edf-af99dec8bde3} + true + false + false + true + false + + + {f99f7b19-47a6-4677-94f2-93c12cf1fb97} + true + false + false + true + false + + + {a69603cc-65e8-443f-8e31-737dbd6bb0db} + + + {a69603cc-65e8-443f-8e31-737dbd6bb0dc} + + + + + + \ No newline at end of file diff --git a/jxrencoderdecoder/JXR_vc14.sln b/jxrencoderdecoder/JXR_vc14.sln new file mode 100644 index 0000000..aa0ce9f --- /dev/null +++ b/jxrencoderdecoder/JXR_vc14.sln @@ -0,0 +1,105 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JXRGlueLib", "..\JXRGlueLib\JXRGlueLib_vc14.vcxproj", "{A69603CC-65E8-443F-8E31-737DBD6BB0DB}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JXRCommonLib", "..\image\VC14Projects\CommonLib_vc14.vcxproj", "{4B4C055C-170E-4DCF-8F73-BED91BE7CFA4}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JXREncodeLib", "..\image\VC14Projects\EncodeLib_vc14.vcxproj", "{F99F7B19-47A6-4677-94F2-93C12CF1FB97}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JXRDecodeLib", "..\image\VC14Projects\DecodeLib_vc14.vcxproj", "{F3DED308-7A6F-4B9F-8EDF-AF99DEC8BDE3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JXRDecApp", "JXRDecApp_vc14.vcxproj", "{472FCCAF-BDFE-4F36-BEEF-09C242F4A98A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JXREncApp", "JXREncApp_vc14.vcxproj", "{FCC17C5C-51B5-44CA-9D70-6C8384AE86E6}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JXRTestLib", "..\JXRTestlib\JXRTestLib_vc14.vcxproj", "{A69603CC-65E8-443F-8E31-737DBD6BB0DC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JXREnc420", "JXREnc420_vc14.vcxproj", "{CE29E199-10D5-4BC0-B9D7-76580A44FCBE}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JXRDec420", "JXRDec420_vc14.vcxproj", "{492EF19B-E3F2-4D0F-99FF-FEBC73DD4F7F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A69603CC-65E8-443F-8E31-737DBD6BB0DB}.Debug|Win32.ActiveCfg = Debug|Win32 + {A69603CC-65E8-443F-8E31-737DBD6BB0DB}.Debug|Win32.Build.0 = Debug|Win32 + {A69603CC-65E8-443F-8E31-737DBD6BB0DB}.Debug|x64.ActiveCfg = Debug|x64 + {A69603CC-65E8-443F-8E31-737DBD6BB0DB}.Debug|x64.Build.0 = Debug|x64 + {A69603CC-65E8-443F-8E31-737DBD6BB0DB}.Release|Win32.ActiveCfg = Release|Win32 + {A69603CC-65E8-443F-8E31-737DBD6BB0DB}.Release|Win32.Build.0 = Release|Win32 + {A69603CC-65E8-443F-8E31-737DBD6BB0DB}.Release|x64.ActiveCfg = Release|x64 + {A69603CC-65E8-443F-8E31-737DBD6BB0DB}.Release|x64.Build.0 = Release|x64 + {4B4C055C-170E-4DCF-8F73-BED91BE7CFA4}.Debug|Win32.ActiveCfg = Debug|Win32 + {4B4C055C-170E-4DCF-8F73-BED91BE7CFA4}.Debug|Win32.Build.0 = Debug|Win32 + {4B4C055C-170E-4DCF-8F73-BED91BE7CFA4}.Debug|x64.ActiveCfg = Debug|x64 + {4B4C055C-170E-4DCF-8F73-BED91BE7CFA4}.Debug|x64.Build.0 = Debug|x64 + {4B4C055C-170E-4DCF-8F73-BED91BE7CFA4}.Release|Win32.ActiveCfg = Release|Win32 + {4B4C055C-170E-4DCF-8F73-BED91BE7CFA4}.Release|Win32.Build.0 = Release|Win32 + {4B4C055C-170E-4DCF-8F73-BED91BE7CFA4}.Release|x64.ActiveCfg = Release|x64 + {4B4C055C-170E-4DCF-8F73-BED91BE7CFA4}.Release|x64.Build.0 = Release|x64 + {F99F7B19-47A6-4677-94F2-93C12CF1FB97}.Debug|Win32.ActiveCfg = Debug|Win32 + {F99F7B19-47A6-4677-94F2-93C12CF1FB97}.Debug|Win32.Build.0 = Debug|Win32 + {F99F7B19-47A6-4677-94F2-93C12CF1FB97}.Debug|x64.ActiveCfg = Debug|x64 + {F99F7B19-47A6-4677-94F2-93C12CF1FB97}.Debug|x64.Build.0 = Debug|x64 + {F99F7B19-47A6-4677-94F2-93C12CF1FB97}.Release|Win32.ActiveCfg = Release|Win32 + {F99F7B19-47A6-4677-94F2-93C12CF1FB97}.Release|Win32.Build.0 = Release|Win32 + {F99F7B19-47A6-4677-94F2-93C12CF1FB97}.Release|x64.ActiveCfg = Release|x64 + {F99F7B19-47A6-4677-94F2-93C12CF1FB97}.Release|x64.Build.0 = Release|x64 + {F3DED308-7A6F-4B9F-8EDF-AF99DEC8BDE3}.Debug|Win32.ActiveCfg = Debug|Win32 + {F3DED308-7A6F-4B9F-8EDF-AF99DEC8BDE3}.Debug|Win32.Build.0 = Debug|Win32 + {F3DED308-7A6F-4B9F-8EDF-AF99DEC8BDE3}.Debug|x64.ActiveCfg = Debug|x64 + {F3DED308-7A6F-4B9F-8EDF-AF99DEC8BDE3}.Debug|x64.Build.0 = Debug|x64 + {F3DED308-7A6F-4B9F-8EDF-AF99DEC8BDE3}.Release|Win32.ActiveCfg = Release|Win32 + {F3DED308-7A6F-4B9F-8EDF-AF99DEC8BDE3}.Release|Win32.Build.0 = Release|Win32 + {F3DED308-7A6F-4B9F-8EDF-AF99DEC8BDE3}.Release|x64.ActiveCfg = Release|x64 + {F3DED308-7A6F-4B9F-8EDF-AF99DEC8BDE3}.Release|x64.Build.0 = Release|x64 + {472FCCAF-BDFE-4F36-BEEF-09C242F4A98A}.Debug|Win32.ActiveCfg = Debug|Win32 + {472FCCAF-BDFE-4F36-BEEF-09C242F4A98A}.Debug|Win32.Build.0 = Debug|Win32 + {472FCCAF-BDFE-4F36-BEEF-09C242F4A98A}.Debug|x64.ActiveCfg = Debug|x64 + {472FCCAF-BDFE-4F36-BEEF-09C242F4A98A}.Debug|x64.Build.0 = Debug|x64 + {472FCCAF-BDFE-4F36-BEEF-09C242F4A98A}.Release|Win32.ActiveCfg = Release|Win32 + {472FCCAF-BDFE-4F36-BEEF-09C242F4A98A}.Release|Win32.Build.0 = Release|Win32 + {472FCCAF-BDFE-4F36-BEEF-09C242F4A98A}.Release|x64.ActiveCfg = Release|x64 + {472FCCAF-BDFE-4F36-BEEF-09C242F4A98A}.Release|x64.Build.0 = Release|x64 + {FCC17C5C-51B5-44CA-9D70-6C8384AE86E6}.Debug|Win32.ActiveCfg = Debug|Win32 + {FCC17C5C-51B5-44CA-9D70-6C8384AE86E6}.Debug|Win32.Build.0 = Debug|Win32 + {FCC17C5C-51B5-44CA-9D70-6C8384AE86E6}.Debug|x64.ActiveCfg = Debug|x64 + {FCC17C5C-51B5-44CA-9D70-6C8384AE86E6}.Debug|x64.Build.0 = Debug|x64 + {FCC17C5C-51B5-44CA-9D70-6C8384AE86E6}.Release|Win32.ActiveCfg = Release|Win32 + {FCC17C5C-51B5-44CA-9D70-6C8384AE86E6}.Release|Win32.Build.0 = Release|Win32 + {FCC17C5C-51B5-44CA-9D70-6C8384AE86E6}.Release|x64.ActiveCfg = Release|x64 + {FCC17C5C-51B5-44CA-9D70-6C8384AE86E6}.Release|x64.Build.0 = Release|x64 + {A69603CC-65E8-443F-8E31-737DBD6BB0DC}.Debug|Win32.ActiveCfg = Debug|Win32 + {A69603CC-65E8-443F-8E31-737DBD6BB0DC}.Debug|Win32.Build.0 = Debug|Win32 + {A69603CC-65E8-443F-8E31-737DBD6BB0DC}.Debug|x64.ActiveCfg = Debug|x64 + {A69603CC-65E8-443F-8E31-737DBD6BB0DC}.Debug|x64.Build.0 = Debug|x64 + {A69603CC-65E8-443F-8E31-737DBD6BB0DC}.Release|Win32.ActiveCfg = Release|Win32 + {A69603CC-65E8-443F-8E31-737DBD6BB0DC}.Release|Win32.Build.0 = Release|Win32 + {A69603CC-65E8-443F-8E31-737DBD6BB0DC}.Release|x64.ActiveCfg = Release|x64 + {A69603CC-65E8-443F-8E31-737DBD6BB0DC}.Release|x64.Build.0 = Release|x64 + {CE29E199-10D5-4BC0-B9D7-76580A44FCBE}.Debug|Win32.ActiveCfg = Debug|Win32 + {CE29E199-10D5-4BC0-B9D7-76580A44FCBE}.Debug|Win32.Build.0 = Debug|Win32 + {CE29E199-10D5-4BC0-B9D7-76580A44FCBE}.Debug|x64.ActiveCfg = Debug|x64 + {CE29E199-10D5-4BC0-B9D7-76580A44FCBE}.Debug|x64.Build.0 = Debug|x64 + {CE29E199-10D5-4BC0-B9D7-76580A44FCBE}.Release|Win32.ActiveCfg = Release|Win32 + {CE29E199-10D5-4BC0-B9D7-76580A44FCBE}.Release|Win32.Build.0 = Release|Win32 + {CE29E199-10D5-4BC0-B9D7-76580A44FCBE}.Release|x64.ActiveCfg = Release|x64 + {CE29E199-10D5-4BC0-B9D7-76580A44FCBE}.Release|x64.Build.0 = Release|x64 + {492EF19B-E3F2-4D0F-99FF-FEBC73DD4F7F}.Debug|Win32.ActiveCfg = Debug|Win32 + {492EF19B-E3F2-4D0F-99FF-FEBC73DD4F7F}.Debug|Win32.Build.0 = Debug|Win32 + {492EF19B-E3F2-4D0F-99FF-FEBC73DD4F7F}.Debug|x64.ActiveCfg = Debug|x64 + {492EF19B-E3F2-4D0F-99FF-FEBC73DD4F7F}.Debug|x64.Build.0 = Debug|x64 + {492EF19B-E3F2-4D0F-99FF-FEBC73DD4F7F}.Release|Win32.ActiveCfg = Release|Win32 + {492EF19B-E3F2-4D0F-99FF-FEBC73DD4F7F}.Release|Win32.Build.0 = Release|Win32 + {492EF19B-E3F2-4D0F-99FF-FEBC73DD4F7F}.Release|x64.ActiveCfg = Release|x64 + {492EF19B-E3F2-4D0F-99FF-FEBC73DD4F7F}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/jxrgluelib/JXRGlueLib_vc14.vcxproj b/jxrgluelib/JXRGlueLib_vc14.vcxproj new file mode 100644 index 0000000..535656f --- /dev/null +++ b/jxrgluelib/JXRGlueLib_vc14.vcxproj @@ -0,0 +1,178 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + JXRGlueLib + {A69603CC-65E8-443F-8E31-737DBD6BB0DB} + JXRGlueLib + Win32Proj + + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(Configuration)/$(ProjectName)\ + $(OutDir) + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + $(Configuration)/$(ProjectName)\ + $(OutDir) + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\image\sys;..\image\x86;..\JXRGlueLib;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + X64 + + + Disabled + ..\image\sys;..\image\x86;..\JXRGlueLib;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + MaxSpeed + true + ..\image\sys;..\image\x86;..\JXRGlueLib;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;ENABLE_OPTIMIZATIONS;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + + + /LTCG %(AdditionalOptions) + $(OutDir)$(ProjectName).lib + true + + + + + X64 + + + ..\image\sys;..\image\x86;..\JXRGlueLib;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).lib + true + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jxrtestlib/JXRTestLib_vc14.vcxproj b/jxrtestlib/JXRTestLib_vc14.vcxproj new file mode 100644 index 0000000..c61b276 --- /dev/null +++ b/jxrtestlib/JXRTestLib_vc14.vcxproj @@ -0,0 +1,179 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + JXRTestLib + {A69603CC-65E8-443F-8E31-737DBD6BB0DC} + JXRTestLib + Win32Proj + + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + StaticLibrary + MultiByte + v140 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(Configuration)/$(ProjectName)\ + $(OutDir) + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + $(Configuration)/$(ProjectName)\ + $(OutDir) + $(Configuration)\$(ProjectName)\$(Platform)\ + $(OutDir) + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + Disabled + ..\image\sys;..\image\x86;..\JXRTestLib;..\JXRGlueLib;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + X64 + + + Disabled + ..\image\sys;..\image\x86;..\JXRTestLib;..\JXRGlueLib;..\common\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level4 + ProgramDatabase + + + $(OutDir)$(ProjectName).lib + + + + + MaxSpeed + true + ..\image\sys;..\image\x86;..\JXRTestLib;..\JXRGlueLib;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;ENABLE_OPTIMIZATIONS;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + + + /LTCG %(AdditionalOptions) + $(OutDir)$(ProjectName).lib + true + + + + + X64 + + + ..\image\sys;..\image\x86;..\JXRTestLib;..\JXRGlueLib;..\common\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) + MultiThreaded + + + Level4 + ProgramDatabase + true + + + $(OutDir)$(ProjectName).lib + true + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jxrtestlib/JXRTestTif.c b/jxrtestlib/JXRTestTif.c index e706833..39f619d 100644 --- a/jxrtestlib/JXRTestTif.c +++ b/jxrtestlib/JXRTestTif.c @@ -325,16 +325,16 @@ ERR WriteTifHeader( if (tifDEMisc.iPhotometricInterpretation == PK_PI_CMYK) { - TifDE tifDE = {TIF_tagInkSet, 3, 1, 1}; - Call(WriteTifDE(pS, offPos, &tifDE)); offPos += 12; + TifDE tmpDE = {TIF_tagInkSet, 3, 1, 1}; + Call(WriteTifDE(pS, offPos, &tmpDE)); offPos += 12; } if (PI.grBit & PK_pixfmtHasAlpha) { - TifDE tifDE = {TIF_tagExtraSamples, 3, 1, 1}; + TifDE tmpDE = {TIF_tagExtraSamples, 3, 1, 1}; if (!(PI.grBit & PK_pixfmtPreMul)) - tifDE.uValueOrOffset++; - Call(WriteTifDE(pS, offPos, &tifDE)); offPos += 12; + tmpDE.uValueOrOffset++; + Call(WriteTifDE(pS, offPos, &tmpDE)); offPos += 12; } tifDE = tifDEs[i++];