More moves towards colour FAX

diff --git a/libs/spandsp/src/Makefile.am b/libs/spandsp/src/Makefile.am
index aad3b91dd721502f07031f7165c46272af821be3..2bab4a9a563b68caee38106a8a5fc6d1d04e829a 100644 (file)
--- a/libs/spandsp/src/Makefile.am
+++ b/libs/spandsp/src/Makefile.am
@@ -50,11 +50,12 @@ MOSTLYCLEANFILES = ${DISTCLEANFILES}
 MAINTAINERCLEANFILES = ${DISTCLEANFILES}
 
 EXTRA_DIST = floating_fudge.h \
-             libspandsp.dsp \
              libspandsp.2005.sln \
              libspandsp.2008.sln \
              libspandsp.2005.vcproj \
              libspandsp.2008.vcproj \
+             libspandsp.2010.vcproj \
+             libspandsp.2012.vcproj \
              libtiff.2005.vcproj \
              libtiff.2008.vcproj \
              filter_tools.c \
@@ -475,37 +476,18 @@ v29tx.lo: ${V29_TX_INCL}
 v29tx_rrc.h: make_modem_filter$(EXEEXT)
        ./make_modem_filter$(EXEEXT) -m V.29 -t >v29tx_rrc.h
 
-DSP = libspandsp.dsp
 VCPROJ8 = libspandsp.2005.vcproj
 VCPROJ9 = libspandsp.2008.vcproj
+VCPROJ10 = libspandsp.2010.vcproj
+VCPROJ12 = libspandsp.2012.vcproj
 
 WIN32SOURCES = $(libspandsp_la_SOURCES) .\\msvc\\gettimeofday.c
 WIN32HEADERS = $(nobase_include_HEADERS) spandsp.h
 
-DSPOUT = | awk '{printf("%s\r\n", $$0)}' >> $(DSP)
 VCPROJOUT8 = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ8)
 VCPROJOUT9 = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ9)
-
-$(DSP): msvc/msvcproj.head msvc/msvcproj.foot Makefile.am
-       echo "creating $(DSP)"
-       @(cp $(srcdir)/msvc/msvcproj.head $(DSP); \
-       echo "# Begin Group \"Source Files\"" $(DSPOUT); \
-       for file in $(WIN32SOURCES); do \
-       echo "# Begin Source File" $(DSPOUT); \
-       echo "" $(DSPOUT); \
-       echo "SOURCE=.\\"$$file $(DSPOUT); \
-       echo "# End Source File" $(DSPOUT); \
-       done; \
-       echo "# End Group" $(DSPOUT); \
-       echo "# Begin Group \"Header Files\"" $(DSPOUT); \
-       for file in $(WIN32HEADERS); do \
-       echo "# Begin Source File" $(DSPOUT); \
-       echo "" $(DSPOUT); \
-       echo "SOURCE=.\\"$$file $(DSPOUT); \
-       echo "# End Source File" $(DSPOUT); \
-       done; \
-       echo "# End Group" $(DSPOUT); \
-       cat $(srcdir)/msvc/msvcproj.foot $(DSPOUT) )
+VCPROJOUT10 = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ10)
+VCPROJOUT12 = | awk '{printf("%s\r\n", $$0)}' >> $(VCPROJ12)
 
 $(VCPROJ8): msvc/vc8proj.head msvc/vc8proj.foot Makefile.am
        echo "creating $(VCPROJ8)"
@@ -531,6 +513,30 @@ $(VCPROJ9): msvc/vc9proj.head msvc/vc9proj.foot Makefile.am
        done; \
        cat $(srcdir)/msvc/vc9proj.foot $(VCPROJOUT9) )
 
+$(VCPROJ10): msvc/vc10proj.head msvc/vc10proj.foot Makefile.am
+       echo "creating $(VCPROJ10)"
+       @(cp $(srcdir)/msvc/vc10proj.head $(VCPROJ10); \
+       for file in $(WIN32SOURCES); do \
+               echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT10); \
+       done; \
+       echo "</Filter><Filter  Name=\"Header Files\">" $(VCPROJOUT10); \
+       for file in $(WIN32HEADERS); do \
+               echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT10); \
+       done; \
+       cat $(srcdir)/msvc/vc10proj.foot $(VCPROJOUT10) )
+
+$(VCPROJ12): msvc/vc12proj.head msvc/vc12proj.foot Makefile.am
+       echo "creating $(VCPROJ12)"
+       @(cp $(srcdir)/msvc/vc12proj.head $(VCPROJ12); \
+       for file in $(WIN32SOURCES); do \
+               echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT12); \
+       done; \
+       echo "</Filter><Filter  Name=\"Header Files\">" $(VCPROJOUT12); \
+       for file in $(WIN32HEADERS); do \
+               echo "<File RelativePath=\""$$file"\"></File>" $(VCPROJOUT12); \
+       done; \
+       cat $(srcdir)/msvc/vc12proj.foot $(VCPROJOUT12) )
+
 $(srcdir)/msvc/spandsp.h: spandsp.h.in
        echo "creating $(srcdir)/msvc/spandsp.h"
        @sed -e "s/#define _SPANDSP_H_/#define _SPANDSP_H_\n\n#define __inline__ __inline\n#pragma warning(disable:4200)/" \

diff --git a/libs/spandsp/src/libspandsp.dsp b/libs/spandsp/src/libspandsp.dsp
deleted file mode 100644 (file)
index d300d3a..0000000
--- a/libs/spandsp/src/libspandsp.dsp
+++ /dev/null
@@ -1,967 +0,0 @@
-# Microsoft Developer Studio Project File - Name="spandsp" - Package Owner=<4>\r
-# Microsoft Developer Studio Generated Build File, Format Version 6.00\r
-# ** DO NOT EDIT **\r
-\r
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102\r
-\r
-CFG=spandsp - Win32 Debug\r
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,\r
-!MESSAGE use the Export Makefile command and run\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "spandsp.mak".\r
-!MESSAGE \r
-!MESSAGE You can specify a configuration when running NMAKE\r
-!MESSAGE by defining the macro CFG on the command line. For example:\r
-!MESSAGE \r
-!MESSAGE NMAKE /f "spandsp.mak" CFG="spandsp - Win32 Debug"\r
-!MESSAGE \r
-!MESSAGE Possible choices for configuration are:\r
-!MESSAGE \r
-!MESSAGE "spandsp - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE "spandsp - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")\r
-!MESSAGE \r
-\r
-# Begin Project\r
-# PROP AllowPerConfigDependencies 0\r
-# PROP Scc_ProjName ""\r
-# PROP Scc_LocalPath ""\r
-CPP=cl.exe\r
-MTL=midl.exe\r
-RSC=rc.exe\r
-\r
-!IF  "$(CFG)" == "spandsp - Win32 Release"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 0\r
-# PROP BASE Output_Dir "Release"\r
-# PROP BASE Intermediate_Dir "Release"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 0\r
-# PROP Output_Dir "Release"\r
-# PROP Intermediate_Dir "Release"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /c\r
-# ADD CPP /nologo /MT /W3 /GX /Zi /O2 /I "." /I "..\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /D "_WINDLL" /FR /FD /c\r
-# SUBTRACT CPP /YX\r
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "NDEBUG"\r
-# ADD RSC /l 0x409 /d "NDEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386\r
-# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /map /debug /machine:I386 /out:"Release/libspandsp.dll"\r
-\r
-!ELSEIF  "$(CFG)" == "spandsp - Win32 Debug"\r
-\r
-# PROP BASE Use_MFC 0\r
-# PROP BASE Use_Debug_Libraries 1\r
-# PROP BASE Output_Dir "Debug"\r
-# PROP BASE Intermediate_Dir "Debug"\r
-# PROP BASE Target_Dir ""\r
-# PROP Use_MFC 0\r
-# PROP Use_Debug_Libraries 1\r
-# PROP Output_Dir "Debug"\r
-# PROP Intermediate_Dir "Debug"\r
-# PROP Ignore_Export_Lib 0\r
-# PROP Target_Dir ""\r
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /YX /FD /GZ /c\r
-# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "." /I "..\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D HAVE_TGMATH_H /FR /FD /GZ /c\r
-# SUBTRACT CPP /WX /YX\r
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32\r
-# ADD BASE RSC /l 0x409 /d "_DEBUG"\r
-# ADD RSC /l 0x409 /d "_DEBUG"\r
-BSC32=bscmake.exe\r
-# ADD BASE BSC32 /nologo\r
-# ADD BSC32 /nologo\r
-LINK32=link.exe\r
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept\r
-# ADD LINK32 kernel32.lib ws2_32.lib winmm.lib /nologo /dll /incremental:no /map /debug /machine:I386 /out:"Debug/libspandsp.dll" /pdbtype:sept\r
-# SUBTRACT LINK32 /nodefaultlib\r
-\r
-!ENDIF \r
-\r
-# Begin Target\r
-\r
-# Name "spandsp - Win32 Release"\r
-# Name "spandsp - Win32 Debug"\r
-# Begin Group "Source Files"\r
-# Begin Source File\r
-\r
-SOURCE=.\adsi.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\async.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\at_interpreter.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\awgn.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bell_r2_mf.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bert.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bit_operations.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\bitstream.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\complex_filters.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\complex_vector_float.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\complex_vector_int.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\crc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dds_float.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dds_int.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\dtmf.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\echo.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\fax.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\fax_modems.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\fsk.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\g711.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\g722.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\g726.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gsm0610_decode.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gsm0610_encode.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gsm0610_long_term.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gsm0610_lpc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gsm0610_preprocess.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gsm0610_rpe.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\gsm0610_short_term.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\hdlc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\ima_adpcm.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\logging.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\lpc10_analyse.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\lpc10_decode.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\lpc10_encode.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\lpc10_placev.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\lpc10_voicing.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\modem_echo.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\modem_connect_tones.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\noise.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\oki_adpcm.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\playout.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\plc.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\power_meter.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\queue.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\schedule.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\sig_tone.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\silence_gen.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\super_tone_rx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\super_tone_tx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\swept_tone.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\t4_rx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\t4_tx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\t30.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\t30_api.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\t30_logging.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\t31.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\t35.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\t38_core.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\t38_gateway.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\t38_non_ecm_buffer.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\t38_terminal.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\testcpuid.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\time_scale.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\tone_detect.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\tone_generate.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v17rx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v17tx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v18.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v22bis_rx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v22bis_tx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v27ter_rx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v27ter_tx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v29rx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v29tx.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v42.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v42bis.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\v8.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\vector_float.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\vector_int.c\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\.\msvc\gettimeofday.c\r
-# End Source File\r
-# End Group\r
-# Begin Group "Header Files"\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/adsi.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/async.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/arctan2.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/at_interpreter.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/awgn.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/bell_r2_mf.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/bert.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/biquad.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/bit_operations.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/bitstream.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/crc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/complex.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/complex_filters.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/complex_vector_float.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/complex_vector_int.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/dc_restore.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/dds.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/dtmf.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/echo.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/fast_convert.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/fax.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/fax_modems.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/fir.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/fsk.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/g168models.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/g711.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/g722.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/g726.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/gsm0610.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/hdlc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/ima_adpcm.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/logging.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/lpc10.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/modem_echo.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/modem_connect_tones.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/noise.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/oki_adpcm.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/playout.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/plc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/power_meter.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/queue.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/saturated.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/schedule.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/sig_tone.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/silence_gen.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/super_tone_rx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/super_tone_tx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/swept_tone.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t4_rx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t4_tx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t30.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t30_api.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t30_fcf.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t30_logging.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t31.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t35.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t38_core.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t38_gateway.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t38_non_ecm_buffer.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/t38_terminal.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/telephony.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/time_scale.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/timing.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/tone_detect.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/tone_generate.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/v17rx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/v17tx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/v18.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/v22bis.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/v27ter_rx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/v27ter_tx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/v29rx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/v29tx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/v42.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/v42bis.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/v8.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/vector_float.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/vector_int.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/version.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/adsi.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/async.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/at_interpreter.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/awgn.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/bell_r2_mf.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/bert.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/bitstream.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/dtmf.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/echo.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/fax.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/fax_modems.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/fsk.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/g711.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/g722.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/g726.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/gsm0610.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/hdlc.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/ima_adpcm.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/logging.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/lpc10.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/modem_connect_tones.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/modem_echo.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/noise.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/oki_adpcm.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/queue.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/schedule.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/sig_tone.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/silence_gen.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/super_tone_rx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/super_tone_tx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/swept_tone.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/t30.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/t30_dis_dtc_dcs_bits.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/t31.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/t38_core.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/t38_gateway.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/t38_non_ecm_buffer.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/t38_terminal.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/t4_rx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/t4_tx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/time_scale.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/tone_detect.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/tone_generate.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/v17rx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/v17tx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/v18.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/v22bis.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/v27ter_rx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/v27ter_tx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/v29rx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/v29tx.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/v42.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/v42bis.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/private/v8.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp/expose.h\r
-# End Source File\r
-# Begin Source File\r
-\r
-SOURCE=.\spandsp.h\r
-# End Source File\r
-# End Group\r
-\r\r
-# Begin Group "Resource Files"\r\r
-\r\r
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"\r\r
-# End Group\r\r
-# End Target\r\r
-# End Project\r\r

diff --git a/libs/spandsp/src/spandsp/private/t30.h b/libs/spandsp/src/spandsp/private/t30.h
index 5965a697e67e438cf4f820913e0b5e49dc9644ec..b0c32d5515c025a9a82d4c5fbde596e1afbbada0 100644 (file)
--- a/libs/spandsp/src/spandsp/private/t30.h
+++ b/libs/spandsp/src/spandsp/private/t30.h
@@ -226,8 +226,6 @@ struct t30_state_s
     int mutual_bilevel_resolutions;
     /*! \brief The common group supported colour image resolutions. */
     int mutual_colour_resolutions;
-    /*! \brief The image coding to be used on the line for non-bilevel images. */
-    int multilevel_line_encoding;
     /*! \brief The image coding being used on the line. */
     int line_encoding;
     /*! \brief The image coding being used for output files. */
@@ -238,6 +236,8 @@ struct t30_state_s
     int x_resolution;
     /*! \brief The Y direction resolution of the current image, in pixels per metre. */
     int y_resolution;
+    /*! \brief The resolution code for the current page. */
+    int current_page_resolution;
     /*! \brief The width of the current image, in pixels. */
     t4_image_width_t image_width;
     /*! \brief Current number of retries of the action in progress. */

diff --git a/libs/spandsp/src/spandsp/private/t30_dis_dtc_dcs_bits.h b/libs/spandsp/src/spandsp/private/t30_dis_dtc_dcs_bits.h
index 8402d094706654feb6c583eeae8588f4a0cfc801..5d6cf93adb18ff32611150a380095583bbf219b9 100644 (file)
--- a/libs/spandsp/src/spandsp/private/t30_dis_dtc_dcs_bits.h
+++ b/libs/spandsp/src/spandsp/private/t30_dis_dtc_dcs_bits.h
@@ -228,7 +228,7 @@
 #define T30_DCS_BIT_DUPLEX_CAPABLE                          67
 
 #define T30_DIS_BIT_T81_CAPABLE                             68
-#define T30_DCS_BIT_FULL_COLOUR_MODEX                       68
+#define T30_DCS_BIT_T81_MODE                                68
 
 #define T30_DIS_BIT_FULL_COLOUR_CAPABLE                     69
 #define T30_DCS_BIT_FULL_COLOUR_MODE                        69

diff --git a/libs/spandsp/src/spandsp/private/t4_tx.h b/libs/spandsp/src/spandsp/private/t4_tx.h
index 6f2fd12349405a4542ee52194e8d6d77caab8383..39a21db48e803ce13ccf8dee7c5eec364abc9476 100644 (file)
--- a/libs/spandsp/src/spandsp/private/t4_tx.h
+++ b/libs/spandsp/src/spandsp/private/t4_tx.h
@@ -98,10 +98,6 @@ struct t4_tx_state_s
     /*! \brief The type of compression used between the FAX machines. */
     int line_encoding;
 
-    int line_encoding_bilevel;
-    int line_encoding_gray;
-    int line_encoding_colour;
-
     /*! \brief When superfine and fine resolution images need to be squahed vertically
                to a lower resolution, this value sets the number of source rows which
                must be squashed to form each row on the wire. */

diff --git a/libs/spandsp/src/spandsp/t4_rx.h b/libs/spandsp/src/spandsp/t4_rx.h
index 5ec633e928845aeb88519d791829b72cfa604736..803a928a31d47c154281ccd97be17641d88b753b 100644 (file)
--- a/libs/spandsp/src/spandsp/t4_rx.h
+++ b/libs/spandsp/src/spandsp/t4_rx.h
@@ -352,19 +352,6 @@ typedef struct
 extern "C" {
 #endif
 
-/*! Get the logging context associated with a T.4 receive context.
-    \brief Get the logging context associated with a T.4 receive context.
-    \param s The T.4 receive context.
-    \return A pointer to the logging context */
-SPAN_DECLARE(logging_state_t *) t4_rx_get_logging_state(t4_rx_state_t *s);
-
-/*! \brief Prepare for reception of a document.
-    \param s The T.4 context.
-    \param file The name of the file to be received.
-    \param output_encoding The output encoding.
-    \return A pointer to the context, or NULL if there was a problem. */
-SPAN_DECLARE(t4_rx_state_t *) t4_rx_init(t4_rx_state_t *s, const char *file, int output_encoding);
-
 /*! \brief Prepare to receive the next page of the current document.
     \param s The T.4 context.
     \return zero for success, -1 for failure. */
@@ -388,20 +375,6 @@ SPAN_DECLARE(int) t4_rx_put(t4_rx_state_t *s, const uint8_t buf[], size_t len);
     \return 0 for success, otherwise -1. */
 SPAN_DECLARE(int) t4_rx_end_page(t4_rx_state_t *s);
 
-/*! \brief End reception of a document. Tidy up and close the file.
-           This should be used to end T.4 reception started with
-           t4_rx_init.
-    \param s The T.4 receive context.
-    \return 0 for success, otherwise -1. */
-SPAN_DECLARE(int) t4_rx_release(t4_rx_state_t *s);
-
-/*! \brief End reception of a document. Tidy up, close the file and
-           free the context. This should be used to end T.4 reception
-           started with t4_rx_init.
-    \param s The T.4 receive context.
-    \return 0 for success, otherwise -1. */
-SPAN_DECLARE(int) t4_rx_free(t4_rx_state_t *s);
-
 /*! \brief Set the row write handler for a T.4 receive context.
     \param s The T.4 receive context.
     \param handler A pointer to the handler routine.
@@ -473,6 +446,32 @@ SPAN_DECLARE(const char *) t4_encoding_to_str(int encoding);
     \return A pointer to the string. */
 SPAN_DECLARE(const char *) t4_image_type_to_str(int type);
 
+/*! Get the logging context associated with a T.4 receive context.
+    \brief Get the logging context associated with a T.4 receive context.
+    \param s The T.4 receive context.
+    \return A pointer to the logging context */
+SPAN_DECLARE(logging_state_t *) t4_rx_get_logging_state(t4_rx_state_t *s);
+
+/*! \brief Prepare for reception of a document.
+    \param s The T.4 context.
+    \param file The name of the file to be received.
+    \param output_encoding The output encoding.
+    \return A pointer to the context, or NULL if there was a problem. */
+SPAN_DECLARE(t4_rx_state_t *) t4_rx_init(t4_rx_state_t *s, const char *file, int output_encoding);
+
+/*! \brief End reception of a document. Tidy up and close the file.
+           This should be used to end T.4 reception started with t4_rx_init.
+    \param s The T.4 receive context.
+    \return 0 for success, otherwise -1. */
+SPAN_DECLARE(int) t4_rx_release(t4_rx_state_t *s);
+
+/*! \brief End reception of a document. Tidy up, close the file and
+           free the context. This should be used to end T.4 reception
+           started with t4_rx_init.
+    \param s The T.4 receive context.
+    \return 0 for success, otherwise -1. */
+SPAN_DECLARE(int) t4_rx_free(t4_rx_state_t *s);
+
 #if defined(__cplusplus)
 }
 #endif

diff --git a/libs/spandsp/src/spandsp/t4_tx.h b/libs/spandsp/src/spandsp/t4_tx.h
index 8ee19be5916945f3fee573c8fcc30e4697ddf2c3..5b1989498d1378b13474a8cc5244dfce13cd51ad 100644 (file)
--- a/libs/spandsp/src/spandsp/t4_tx.h
+++ b/libs/spandsp/src/spandsp/t4_tx.h
@@ -221,20 +221,6 @@ extern "C" {
 SPAN_DECLARE(void) TIFF_FX_init(void);
 #endif
 
-/*! Get the logging context associated with a T.4 transmit context.
-    \brief Get the logging context associated with a T.4 transmit context.
-    \param s The T.4 transmit context.
-    \return A pointer to the logging context */
-SPAN_DECLARE(logging_state_t *) t4_tx_get_logging_state(t4_tx_state_t *s);
-
-/*! \brief Prepare for transmission of a document.
-    \param s The T.4 context.
-    \param file The name of the file to be sent.
-    \param start_page The first page to send. -1 for no restriction.
-    \param stop_page The last page to send. -1 for no restriction.
-    \return A pointer to the context, or NULL if there was a problem. */
-SPAN_DECLARE(t4_tx_state_t *) t4_tx_init(t4_tx_state_t *s, const char *file, int start_page, int stop_page);
-
 /*! \brief Prepare to send the next page of the current document.
     \param s The T.4 context.
     \return zero for success, -1 for failure. */
@@ -281,19 +267,6 @@ SPAN_DECLARE(int) t4_tx_get_bit(t4_tx_state_t *s);
             indicates that the end of the document has been reached. */
 SPAN_DECLARE(int) t4_tx_get(t4_tx_state_t *s, uint8_t buf[], size_t max_len);
 
-/*! \brief End the transmission of a document. Tidy up and close the file.
-           This should be used to end T.4 transmission started with t4_tx_init.
-    \param s The T.4 context.
-    \return 0 for success, otherwise -1. */
-SPAN_DECLARE(int) t4_tx_release(t4_tx_state_t *s);
-
-/*! \brief End the transmission of a document. Tidy up, close the file and
-           free the context. This should be used to end T.4 transmission
-           started with t4_tx_init.
-    \param s The T.4 context.
-    \return 0 for success, otherwise -1. */
-SPAN_DECLARE(int) t4_tx_free(t4_tx_state_t *s);
-
 /*! \brief Set the encoding for the encoded data.
     \param s The T.4 context.
     \param encoding The encoding.
@@ -389,6 +362,33 @@ SPAN_DECLARE(int) t4_tx_get_current_page_in_file(t4_tx_state_t *s);
     \param t A pointer to a statistics structure. */
 SPAN_DECLARE(void) t4_tx_get_transfer_statistics(t4_tx_state_t *s, t4_stats_t *t);
 
+/*! Get the logging context associated with a T.4 transmit context.
+    \brief Get the logging context associated with a T.4 transmit context.
+    \param s The T.4 transmit context.
+    \return A pointer to the logging context */
+SPAN_DECLARE(logging_state_t *) t4_tx_get_logging_state(t4_tx_state_t *s);
+
+/*! \brief Prepare for transmission of a document.
+    \param s The T.4 context.
+    \param file The name of the file to be sent.
+    \param start_page The first page to send. -1 for no restriction.
+    \param stop_page The last page to send. -1 for no restriction.
+    \return A pointer to the context, or NULL if there was a problem. */
+SPAN_DECLARE(t4_tx_state_t *) t4_tx_init(t4_tx_state_t *s, const char *file, int start_page, int stop_page);
+
+/*! \brief End the transmission of a document. Tidy up and close the file.
+           This should be used to end T.4 transmission started with t4_tx_init.
+    \param s The T.4 context.
+    \return 0 for success, otherwise -1. */
+SPAN_DECLARE(int) t4_tx_release(t4_tx_state_t *s);
+
+/*! \brief End the transmission of a document. Tidy up, close the file and
+           free the context. This should be used to end T.4 transmission
+           started with t4_tx_init.
+    \param s The T.4 context.
+    \return 0 for success, otherwise -1. */
+SPAN_DECLARE(int) t4_tx_free(t4_tx_state_t *s);
+
 #if defined(__cplusplus)
 }
 #endif

diff --git a/libs/spandsp/src/t4_rx.c b/libs/spandsp/src/t4_rx.c
index dec06eb1edd6639416a0a35d0d317e373f46c58a..4e0e37a19be197a0d67e098ef15014c51bd5fad5 100644 (file)
--- a/libs/spandsp/src/t4_rx.c
+++ b/libs/spandsp/src/t4_rx.c
@@ -149,7 +149,6 @@ static int set_tiff_directory_info(t4_rx_state_t *s)
     int bits_per_sample;
     int samples_per_pixel;
     int photometric;
-    int image_length;
 
     t = &s->tiff;
     /* Prepare the directory entry fully before writing the image, or libtiff complains */
@@ -276,7 +275,7 @@ static int set_tiff_directory_info(t4_rx_state_t *s)
     /* TIFF page numbers start from zero, so the number of pages in the file
        is always one greater than the highest page number in the file. */
     s->tiff.pages_in_file = s->current_page + 1;
-    image_length = 0;
+    s->image_length = 0;
     switch (s->line_encoding)
     {
     case T4_COMPRESSION_T4_1D:
@@ -297,23 +296,23 @@ static int set_tiff_directory_info(t4_rx_state_t *s)
         }
         /* Fall through */
     case T4_COMPRESSION_T6:
-        image_length = t4_t6_decode_get_image_length(&s->decoder.t4_t6);
+        s->image_length = t4_t6_decode_get_image_length(&s->decoder.t4_t6);
         break;
     case T4_COMPRESSION_T42_T81:
-        image_length = t42_decode_get_image_length(&s->decoder.t42);
+        s->image_length = t42_decode_get_image_length(&s->decoder.t42);
         break;
 #if defined(SPANDSP_SUPPORT_T43)
     case T4_COMPRESSION_T43:
-        image_length = t43_decode_get_image_length(&s->decoder.t43);
+        s->image_length = t43_decode_get_image_length(&s->decoder.t43);
         break;
 #endif
     case T4_COMPRESSION_T85:
     case T4_COMPRESSION_T85_L0:
-        image_length = t85_decode_get_image_length(&s->decoder.t85);
+        s->image_length = t85_decode_get_image_length(&s->decoder.t85);
         break;
     }
-    TIFFSetField(t->tiff_file, TIFFTAG_IMAGELENGTH, image_length);
-    TIFFSetField(t->tiff_file, TIFFTAG_ROWSPERSTRIP, image_length);
+    TIFFSetField(t->tiff_file, TIFFTAG_IMAGELENGTH, s->image_length);
+    TIFFSetField(t->tiff_file, TIFFTAG_ROWSPERSTRIP, s->image_length);
 #if defined(SPANDSP_SUPPORT_TIFF_FX)
     TIFFSetField(t->tiff_file, TIFFTAG_PROFILETYPE, PROFILETYPE_G3_FAX);
     TIFFSetField(t->tiff_file, TIFFTAG_FAXPROFILE, FAXPROFILE_S);

diff --git a/libs/spandsp/tests/fax_tests.sh b/libs/spandsp/tests/fax_tests.sh
index 564cdaa4ba683b0f4e11dafcddc7f539b3f22087..4e0c078c625d4287409787333410387900f246df 100755 (executable)
--- a/libs/spandsp/tests/fax_tests.sh
+++ b/libs/spandsp/tests/fax_tests.sh
@@ -52,10 +52,10 @@ do
     FILE="${ITUTESTS_DIR}/striped.tif"
     run_fax_test
 
-
     FILE="${ITUTESTS_DIR}/mixed_size_pages.tif"
     run_fax_test
 
+
     FILE="${ITUTESTS_DIR}/bilevel_R8_385_A4.tif"
     run_fax_test
 

diff --git a/libs/spandsp/tests/t4_tests.c b/libs/spandsp/tests/t4_tests.c
index 2c867e6d1645111eb3cb01aed68200a86e6291f4..d31fc4d631b5a0e70db8666bee5b2fc582b85601 100644 (file)
--- a/libs/spandsp/tests/t4_tests.c
+++ b/libs/spandsp/tests/t4_tests.c
@@ -285,15 +285,15 @@ int main(int argc, char *argv[])
         T4_COMPRESSION_T4_1D,
         T4_COMPRESSION_T4_2D,
         T4_COMPRESSION_T6,
+        T4_COMPRESSION_T85,
+        T4_COMPRESSION_T85_L0,
 #if defined(SPANDSP_SUPPORT_T42x)
-        T4_COMPRESSION_T42,
-        T4_COMPRESSION_SYCC_T42,
+        T4_COMPRESSION_T42_T81,
+        T4_COMPRESSION_SYCC_T81,
 #endif
 #if defined(SPANDSP_SUPPORT_T43x)
         T4_COMPRESSION_T43,
 #endif
-        T4_COMPRESSION_T85,
-        T4_COMPRESSION_T85_L0,
         //T4_COMPRESSION_T45,
         -1
     };
@@ -366,10 +366,15 @@ int main(int argc, char *argv[])
                 compression = T4_COMPRESSION_T6;
                 compression_step = -1;
             }
+            else if (strcmp(optarg, "T85") == 0)
+            {
+                compression = T4_COMPRESSION_T85;
+                compression_step = -1;
+            }
 #if defined(SPANDSP_SUPPORT_T42)
-            else if (strcmp(optarg, "T42") == 0)
+            else if (strcmp(optarg, "T81") == 0)
             {
-                compression = T4_COMPRESSION_T42;
+                compression = T4_COMPRESSION_T42_T81;
                 compression_step = -1;
             }
 #endif
@@ -380,11 +385,6 @@ int main(int argc, char *argv[])
                 compression_step = -1;
             }
 #endif
-            else if (strcmp(optarg, "T85") == 0)
-            {
-                compression = T4_COMPRESSION_T85;
-                compression_step = -1;
-            }
             break;
         case 'd':
             decode_file_name = optarg;