jpeg version 6 to version 9

fischertechnik · Jun 27, 2020 · c81a20a · c81a20a
1 parent 880a3ce
commit c81a20a
Show file tree

Hide file tree

Showing 218 changed files with 93,017 additions and 10,184 deletions.
diff --git a/Camera/Camera.vcxproj b/Camera/Camera.vcxproj
@@ -58,7 +58,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\Jpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Jpeg-9d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -77,7 +77,7 @@
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\Jpeg;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\Jpeg-9d;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -107,9 +107,8 @@
     <ClInclude Include="..\Common\ftProInterface2013TransferAreaCom.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Jpeg\Jpeg.vcxproj">
-      <Project>{30d20558-4191-42f9-8833-3313840dcf49}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    <ProjectReference Include="..\jpeg-9d\jpeg-9d.vcxproj">
+      <Project>{019dbd2a-273d-4ba4-bf86-b5efe2ed76b1}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

diff --git a/Camera/Main.cpp b/Camera/Main.cpp
@@ -76,7 +76,7 @@ int main()
             {
                 // Write YUV file (typically YUV422 interleaved, depends on camera)
                 std::ostringstream filenameC;
-                filenameC << fnBase << iLoop << ".yuv";
+                filenameC << fnBase << iLoop <<"_x.yuv";
                 ofstream file( filenameC.str().c_str(), ofstream::binary | ofstream::trunc );
                 file.write( (char*)yuv, yuvsize );
                 file.close();
@@ -89,7 +89,7 @@ int main()
 
             // Write JPEG
             std::ostringstream filename;
-            filename << fnBase << iLoop << ".jpg";
+            filename << fnBase << iLoop << "_x.jpg";
             ofstream file( filename.str().c_str(), ofstream::binary | ofstream::trunc );
             file.write( (char*)buffer, size );
             file.close();

diff --git a/Common/frProInterface2013JpegDecode.cpp b/Common/frProInterface2013JpegDecode.cpp
@@ -47,7 +47,7 @@ extern "C" {
 /* Read JPEG image from a memory segment  (This already exists in jpeglib v8) */
 static void init_source (j_decompress_ptr cinfo) {}
 
-static wxjpeg_boolean fill_input_buffer (j_decompress_ptr cinfo)
+static /*wxjpeg_*/boolean fill_input_buffer (j_decompress_ptr cinfo)
 {
     ERREXIT(cinfo, JERR_INPUT_EMPTY);
     return TRUE;

diff --git a/Jpeg/Jpeg.vcxproj b/Jpeg/Jpeg.vcxproj