More tweaks

diff --git a/libs/spandsp/tests/msvc/t38_terminal_tests.vcproj b/libs/spandsp/tests/msvc/t38_terminal_tests.vcproj
deleted file mode 100644 (file)
index 20977a3..0000000
--- a/libs/spandsp/tests/msvc/t38_terminal_tests.vcproj
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="8.00"\r
-       Name="t38-terminal-tests"\r
-       ProjectGUID="{B5DECF33-1D06-459A-AE70-A06404909919}"\r
-       RootNamespace="t38terminaltests"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       CharacterSet="2"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               AdditionalIncludeDirectories="&quot;..\src&quot;;&quot;..\spandsp-sim&quot;;..\..\libtiff\include;&quot;..\src\msvc&quot;"\r
-                               MinimalRebuild="true"\r
-                               BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="4"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\src\Debug\spandsp.lib ..\spandsp-sim\Debug\spandsp.lib"\r
-                               GenerateDebugInformation="true"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="1"\r
-                       CharacterSet="2"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               RuntimeLibrary="2"\r
-                               WarningLevel="3"\r
-                               Detect64BitPortabilityProblems="true"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               GenerateDebugInformation="true"\r
-                               OptimizeReferences="2"\r
-                               EnableCOMDATFolding="2"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebDeploymentTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="Source Files"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath="fax_utils.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\src\msvc\getopt.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="media_monitor.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath="t38_terminal_tests.c"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="Header Files"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-               </Filter>\r
-               <Filter\r
-                       Name="Resource Files"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-               </Filter>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r

diff --git a/libs/spandsp/tests/t42_tests.c b/libs/spandsp/tests/t42_tests.c
index b9dda77668b8537a2f931e8362f13b2d53209cb2..588bfdd3fe957005c5426b649ad95a8c126306af 100644 (file)
--- a/libs/spandsp/tests/t42_tests.c
+++ b/libs/spandsp/tests/t42_tests.c
@@ -45,6 +45,10 @@
 
 #include "spandsp.h"
 
+#if defined(SPANDSP_SUPPORT_TIFF_FX)
+//#include <tif_dir.h>
+#endif
+
 //#define IN_FILE_NAME    "../test-data/itu/t24/F21_200.TIF"
 #define IN_FILE_NAME    "../test-data/itu/t24/F21B400.TIF"
 #define OUT_FILE_NAME   "t42_tests_receive.tif"
@@ -145,6 +149,7 @@ int main(int argc, char *argv[])
     uint16_t *map_a;
     uint16_t *map_b;
     uint16_t *map_z;
+    uint32_t jpeg_table_len;
     logging_state_t *logging;
 
     printf("Demo of ITU/Lab library.\n");
@@ -187,6 +192,7 @@ int main(int argc, char *argv[])
     planar_config = 0;
     TIFFGetField(tif, TIFFTAG_PLANARCONFIG, &planar_config);
     off = 0;
+
     map_L = NULL;
     map_a = NULL;
     map_b = NULL;
@@ -260,7 +266,19 @@ int main(int argc, char *argv[])
 
     if (process_raw)
     {
+        uint8_t *jpeg_table;
+
         nstrips = TIFFNumberOfStrips(tif);
+
+        total_image_len = 0;
+        jpeg_table_len = 0;
+        if (TIFFGetField(tif, TIFFTAG_JPEGTABLES, &jpeg_table_len, &jpeg_table))
+        {
+            total_image_len += (jpeg_table_len - 4);
+            printf("JPEG tables %u\n", jpeg_table_len);
+            printf("YYY %d - %x %x %x %x\n", jpeg_table_len, jpeg_table[0], jpeg_table[1], jpeg_table[2], jpeg_table[3]);
+        }
+
         for (i = 0, total_image_len = 0;  i < nstrips;  i++)
             total_image_len += TIFFRawStripSize(tif, i);
         data = malloc(total_image_len);
@@ -272,6 +290,9 @@ int main(int argc, char *argv[])
                 return -1;
             }
         }
+        if (jpeg_table_len > 0)
+            memcpy(data, jpeg_table, jpeg_table_len - 2);
+
         if (total_len != total_image_len)
             printf("Size mismatch %ld %ld\n", total_len, total_image_len);
         off = total_len;
@@ -420,7 +441,7 @@ int main(int argc, char *argv[])
                 return 1;
             off += bytes_per_row;
         }
-        printf("total %d, off %ld\n", totdata, off);
+        printf("total %u, off %ld\n", totdata, off);
 
         /* We now have the image in memory in RGB form */