update to snapshot spandsp-20090220

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12190 d0543943-73ff-0310-b7d9-9358b9ac24b2

libs/spandsp/test-data/etsi/fax/Makefile.am

@@ -16,30 +16,33 @@
 ## along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##
-## $Id: Makefile.am,v 1.2 2008/09/10 16:55:15 steveu Exp $
+## $Id: Makefile.am,v 1.3 2009/02/20 12:34:20 steveu Exp $
 
 AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
 
 PBM2G3 = pbmtog3
 FAX2TIFF = fax2tiff
+TIFFCP = tiffcp
+
+ETSI_TEST_PAGES = etsi_300_242_a4_diago1.tif \
+                  etsi_300_242_a4_diago2.tif \
+                  etsi_300_242_a4_duration1.tif \
+                  etsi_300_242_a4_duration2.tif \
+                  etsi_300_242_a4_error.tif \
+                  etsi_300_242_a4_impress.tif \
+                  etsi_300_242_a4_impress_white.tif \
+                  etsi_300_242_a4_stairstep.tif \
+                  etsi_300_242_a4_white.tif \
+                  etsi_300_242_a4_white_2p.tif
 
 EXTRA_DIST = 
 
-nobase_data_DATA = etsi_300_242_a4_diago1.tif \
-                   etsi_300_242_a4_diago2.tif \
-                   etsi_300_242_a4_duration1.tif \
-                   etsi_300_242_a4_duration2.tif \
-                   etsi_300_242_a4_error.tif \
-                   etsi_300_242_a4_impress.tif \
-                   etsi_300_242_a4_impress_white.tif \
-                   etsi_300_242_a4_stairstep.tif \
-                   etsi_300_242_a4_white.tif \
-                   etsi_300_242_a4_white_2p.tif
+nobase_data_DATA = ${ETSI_TEST_PAGES}
                    
-noinst_PROGRAMS =   generate_etsi_300_242_pages
+noinst_PROGRAMS = generate_etsi_300_242_pages
 
 generate_etsi_300_242_pages_SOURCES = generate_etsi_300_242_pages.c
-generate_etsi_300_242_pages_LDADD = -ltiff
+generate_etsi_300_242_pages_LDADD = -lspandsp -ltiff
 
 clean:
 	rm -f *.tif *.g3
@@ -50,14 +53,5 @@ clean:
 .pbm.g3:
 	${PBM2G3} $*.pbm >$*.g3
 
-etsi_300_242_a4_diago1.tif \
-etsi_300_242_a4_diago2.tif \
-etsi_300_242_a4_duration1.tif \
-etsi_300_242_a4_duration2.tif \
-etsi_300_242_a4_error.tif \
-etsi_300_242_a4_impress.tif \
-etsi_300_242_a4_impress_white.tif \
-etsi_300_242_a4_stairstep.tif \
-etsi_300_242_a4_white.tif \
-etsi_300_242_a4_white_2p.tif: generate_etsi_300_242_pages$(EXEEXT)
+${ETSI_TEST_PAGES}: generate_etsi_300_242_pages$(EXEEXT)
 	./generate_etsi_300_242_pages$(EXEEXT)

libs/spandsp/test-data/etsi/fax/generate_etsi_300_242_pages.c

@@ -22,7 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: generate_etsi_300_242_pages.c,v 1.2 2008/09/10 16:55:15 steveu Exp $
+ * $Id: generate_etsi_300_242_pages.c,v 1.3 2009/02/20 12:34:20 steveu Exp $
  */
 
 /*! \file */
@@ -177,6 +177,9 @@ struct
     },
 };
 
+int reverse_photo_metric = FALSE;
+int reverse_fill_order = FALSE;
+
 static void clear_row(uint8_t buf[], int width)
 {
     memset(buf, 0, width/8 + 1);
@@ -245,6 +248,7 @@ static int create_stairstep_page(TIFF *tiff_file)
     uint8_t image_buffer[8192];
     int row;
     int start_pixel;
+    int i;
 
     /* TSB-85 STAIRSTEP page. */
     start_pixel = 0;
@@ -252,6 +256,13 @@ static int create_stairstep_page(TIFF *tiff_file)
     {
         clear_row(image_buffer, 1728);
         set_pixel_range(image_buffer, 1, start_pixel, start_pixel + 63);
+        if (reverse_photo_metric)
+        {
+            for (i = 0;  i < 1728/8;  i++)
+                image_buffer[i] = ~image_buffer[i];
+        }
+        if (reverse_fill_order)
+            bit_reverse(image_buffer, image_buffer, 1728/8);
         if (TIFFWriteScanline(tiff_file, image_buffer, row, 0) < 0)
         {
             printf("Write error at row %d.\n", row);
@@ -571,9 +582,14 @@ int main(int argc, char *argv[])
         TIFFSetField(tiff_file, TIFFTAG_SAMPLESPERPIXEL, 1);
         TIFFSetField(tiff_file, TIFFTAG_ROWSPERSTRIP, -1L);
         TIFFSetField(tiff_file, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
-        TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE);
-        TIFFSetField(tiff_file, TIFFTAG_FILLORDER, FILLORDER_LSB2MSB);
-    
+        if (reverse_photo_metric)
+            TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISBLACK);
+        else
+            TIFFSetField(tiff_file, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_MINISWHITE);
+        if (reverse_fill_order)
+            TIFFSetField(tiff_file, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB);
+        else
+            TIFFSetField(tiff_file, TIFFTAG_FILLORDER, FILLORDER_LSB2MSB);
         x_resolution = sequence[i].x_res/100.0f;
         y_resolution = sequence[i].y_res/100.0f;
         TIFFSetField(tiff_file, TIFFTAG_XRESOLUTION, floorf(x_resolution*2.54f + 0.5f));

libs/spandsp/test-data/itu/fax/Makefile.am

@@ -16,72 +16,93 @@
 ## License along with this program; if not, write to the Free Software
 ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 ##
-## $Id: Makefile.am,v 1.3 2008/05/03 13:05:04 steveu Exp $
+## $Id: Makefile.am,v 1.4 2009/02/20 12:34:20 steveu Exp $
 
 AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
 AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS)
 
 PBM2G3 = pbmtog3
 FAX2TIFF = fax2tiff
+TIFFCP = tiffcp
 
-EXTRA_DIST = itu1.pbm \
-             itu2.pbm \
-             itu3.pbm \
-             itu4.pbm \
-             itu5.pbm \
-             itu6.pbm \
-             itu7.pbm \
-             itu8.pbm \
-             test1.pbm \
-             test2.pbm \
-             test3.pbm \
-             test4.pbm
+ITU_TEST_PAGES_PBM = itu1.pbm \
+                     itu2.pbm \
+                     itu3.pbm \
+                     itu4.pbm \
+                     itu5.pbm \
+                     itu6.pbm \
+                     itu7.pbm \
+                     itu8.pbm \
+                     test1.pbm \
+                     test2.pbm \
+                     test3.pbm \
+                     test4.pbm
+
+ITU_TEST_PAGES_G3 = itu1.g3 \
+                    itu2.g3 \
+                    itu3.g3 \
+                    itu4.g3 \
+                    itu5.g3 \
+                    itu6.g3 \
+                    itu7.g3 \
+                    itu8.g3 \
+                    test1.g3 \
+                    test2.g3 \
+                    test3.g3 \
+                    test4.g3
+
+ITU_TEST_PAGES = itu1.tif \
+                 itu2.tif \
+                 itu3.tif \
+                 itu4.tif \
+                 itu5.tif \
+                 itu6.tif \
+                 itu7.tif \
+                 itu8.tif \
+                 test1.tif \
+                 test2.tif \
+                 test3.tif \
+                 test4.tif
+
+MIXED_SIZE_PAGES = R1200_1200_A4.tif \
+                   R1200_1200_B4.tif \
+                   R1200_1200_A3.tif \
+                   R600_1200_A4.tif \
+                   R600_1200_B4.tif \
+                   R600_1200_A3.tif \
+                   R600_600_A4.tif \
+                   R600_600_B4.tif \
+                   R600_600_A3.tif \
+                   R16_800_A4.tif \
+                   R16_800_B4.tif \
+                   R16_800_A3.tif \
+                   R16_154_A4.tif \
+                   R16_154_B4.tif \
+                   R16_154_A3.tif \
+                   R300_600_A4.tif \
+                   R300_600_B4.tif \
+                   R300_600_A3.tif \
+                   R300_300_A4.tif \
+                   R300_300_B4.tif \
+                   R300_300_A3.tif \
+                   R8_154_A4.tif \
+                   R8_154_B4.tif \
+                   R8_154_A3.tif \
+                   R8_77_A4.tif \
+                   R8_77_B4.tif \
+                   R8_77_A3.tif \
+                   R8_385_A4.tif \
+                   R8_385_B4.tif \
+                   R8_385_A3.tif
+
+EXTRA_DIST = ${ITU_TEST_PAGES_PBM}
 
 nobase_data_DATA =  itutests.tif \
-                    itu1.tif \
-                    itu2.tif \
-                    itu3.tif \
-                    itu4.tif \
-                    itu5.tif \
-                    itu6.tif \
-                    itu7.tif \
-                    itu8.tif \
-                    test1.tif \
-                    test2.tif \
-                    test3.tif \
-                    test4.tif \
+                    ${ITU_TEST_PAGES} \
                     dithered.tif \
                     100pages.tif \
-                    R1200_1200_A4.tif \
-                    R1200_1200_B4.tif \
-                    R1200_1200_A3.tif \
-                    R600_1200_A4.tif \
-                    R600_1200_B4.tif \
-                    R600_1200_A3.tif \
-                    R600_600_A4.tif \
-                    R600_600_B4.tif \
-                    R600_600_A3.tif \
-                    R16_800_A4.tif \
-                    R16_800_B4.tif \
-                    R16_800_A3.tif \
-                    R16_154_A3.tif \
-                    R16_154_A4.tif \
-                    R16_154_B4.tif \
-                    R300_600_A4.tif \
-                    R300_600_B4.tif \
-                    R300_600_A3.tif \
-                    R300_300_A4.tif \
-                    R300_300_B4.tif \
-                    R300_300_A3.tif \
-                    R8_154_A3.tif \
-                    R8_154_A4.tif \
-                    R8_154_B4.tif \
-                    R8_77_A3.tif \
-                    R8_77_A4.tif \
-                    R8_77_B4.tif \
-                    R8_385_A3.tif \
-                    R8_385_A4.tif \
-                    R8_385_B4.tif
+                    ${MIXED_SIZE_PAGES} \
+                    mixed_size_pages.tif
 
 noinst_PROGRAMS =   generate_dithered_tif \
                     generate_sized_pages
@@ -95,22 +116,19 @@ generate_sized_pages_LDADD = -ltiff
 clean:
 	rm -f *.tif *.g3
 
-itutests.tif: itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 \
-              test1.g3 test2.g3 test3.g3 test4.g3
-	$(FAX2TIFF) -M -o $@ itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 \
-                test1.g3 test2.g3 test3.g3 test4.g3
+itutests.tif: ${ITU_TEST_PAGES_G3}
+	$(FAX2TIFF) -M -o $@ ${ITU_TEST_PAGES_G3}
 
-100pages.tif: itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 \
-              test1.g3 test2.g3 test3.g3 test4.g3
+100pages.tif: ${ITU_TEST_PAGES_G3}
 	$(FAX2TIFF) -M -o $@ \
-        itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 test1.g3 test2.g3 test3.g3 test4.g3 \
-        itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 test1.g3 test2.g3 test3.g3 test4.g3 \
-        itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 test1.g3 test2.g3 test3.g3 test4.g3 \
-        itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 test1.g3 test2.g3 test3.g3 test4.g3 \
-        itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 test1.g3 test2.g3 test3.g3 test4.g3 \
-        itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 test1.g3 test2.g3 test3.g3 test4.g3 \
-        itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 test1.g3 test2.g3 test3.g3 test4.g3 \
-        itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 test1.g3 test2.g3 test3.g3 test4.g3 \
+        ${ITU_TEST_PAGES_G3} \
+        ${ITU_TEST_PAGES_G3} \
+        ${ITU_TEST_PAGES_G3} \
+        ${ITU_TEST_PAGES_G3} \
+        ${ITU_TEST_PAGES_G3} \
+        ${ITU_TEST_PAGES_G3} \
+        ${ITU_TEST_PAGES_G3} \
+        ${ITU_TEST_PAGES_G3} \
         itu1.g3 itu2.g3 itu3.g3 itu4.g3
 
 .g3.tif:
@@ -122,34 +140,8 @@ itutests.tif: itu1.g3 itu2.g3 itu3.g3 itu4.g3 itu5.g3 itu6.g3 itu7.g3 itu8.g3 \
 dithered.tif: generate_dithered_tif$(EXEEXT)
 	./generate_dithered_tif$(EXEEXT)
 
-R1200_1200_A4.tif \
-R1200_1200_B4.tif \
-R1200_1200_A3.tif \
-R600_1200_A4.tif \
-R600_1200_B4.tif \
-R600_1200_A3.tif \
-R600_600_A4.tif \
-R600_600_B4.tif \
-R600_600_A3.tif \
-R16_800_A4.tif \
-R16_800_B4.tif \
-R16_800_A3.tif \
-R16_154_A3.tif \
-R16_154_A4.tif \
-R16_154_B4.tif \
-R300_600_A4.tif \
-R300_600_B4.tif \
-R300_600_A3.tif \
-R300_300_A4.tif \
-R300_300_B4.tif \
-R300_300_A3.tif \
-R8_154_A3.tif \
-R8_154_A4.tif \
-R8_154_B4.tif \
-R8_77_A3.tif \
-R8_77_A4.tif \
-R8_77_B4.tif \
-R8_385_A3.tif \
-R8_385_A4.tif \
-R8_385_B4.tif: generate_sized_pages$(EXEEXT)
+${MIXED_SIZE_PAGES}: generate_sized_pages$(EXEEXT)
 	./generate_sized_pages$(EXEEXT)
+
+mixed_size_pages.tif: ${MIXED_SIZE_PAGES}
+	$(TIFFCP) ${MIXED_SIZE_PAGES} $@