| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123 |
- Index: config/mkmainlib.inc
- diff -Nau config/mkmainlib.inc.orig config/mkmainlib.inc
- --- config/mkmainlib.inc.orig 2004-01-26 14:30:23.000000000 +0100
- +++ config/mkmainlib.inc 2004-02-12 09:08:24.000000000 +0100
- @@ -28,7 +28,7 @@
- @-if test "$(WITH_SHARED)" = "no"; then \
- cp .libs/$(MAINLIBNAME) .libs/$(MAINLIBNAME)i;\
- fi
- - $(LIBTOOL) $(INSTALL_DATA) $(MAINLIBNAME) $(libdir);
- + $(LIBTOOL) --mode=install $(INSTALL_DATA) $(MAINLIBNAME) $(libdir);
- @-if test "$(WITH_SHARED)" = "yes"; then \
- $(LIBTOOL) -n --finish $(libdir);\
- else\
- Index: configure
- diff -Nau configure.orig configure
- --- configure.orig 2004-07-07 20:29:08.000000000 +0200
- +++ configure 2004-10-27 17:04:45.110483011 +0200
- @@ -8908,6 +8908,7 @@
-
-
- # zlib
- +if [ ".$FLATELIBINC" = . -a ".$FLATELIBLINK" = . ]; then
- if test -d libs/flate ; then
- FLATELIBINC="-I\$(top_builddir)/libs/flate"
- FLATELIBLINK="\$(top_builddir)/libs/flate/libz\$(LA)"
- @@ -8917,10 +8918,12 @@
- FLATELIBINC=""
- FLATELIBLINK=""
- fi
- +fi
-
-
-
- # pnglib
- +if [ ".$PNGLIBINC" = . -a ".$PNGLIBLINK" = . ]; then
- if test -d libs/png ; then
- PNGLIBINC="-I\$(top_builddir)/libs/png"
- PNGLIBLINK="\$(top_builddir)/libs/png/libpng\$(LA)"
- @@ -8930,10 +8933,12 @@
- PNGLIBINC=""
- PNGLIBLINK=""
- fi
- +fi
-
-
-
- # tifflib
- +if [ ".$TIFFLIBINC" = . -a ".$TIFFLIBLINK" = . ]; then
- if test -d libs/tiff ; then
- TIFFLIBINC="-I\$(top_builddir)/libs/tiff"
- TIFFLIBLINK="\$(top_builddir)/libs/tiff/libtiff\$(LA)"
- @@ -8943,10 +8948,12 @@
- TIFFLIBINC=""
- TIFFLIBLINK=""
- fi
- +fi
-
-
-
- # jpeglib
- +if [ ".$JPEGLIBINC" = . -a ".$JPEGLIBLINK" = . ]; then
- if test -d libs/jpeg ; then
- JPEGLIBINC="-I\$(top_builddir)/libs/jpeg"
- JPEGLIBLINK="\$(top_builddir)/libs/jpeg/libjpeg\$(LA)"
- @@ -8956,6 +8963,7 @@
- JPEGLIBINC=""
- JPEGLIBLINK=""
- fi
- +fi
-
-
-
- Index: libs/tiff/tif_ojpeg.c
- diff -Nau libs/tiff/tif_ojpeg.c.orig libs/tiff/tif_ojpeg.c
- --- libs/tiff/tif_ojpeg.c.orig 2004-07-07 20:29:14 +0200
- +++ libs/tiff/tif_ojpeg.c 2004-10-28 12:27:57 +0200
- @@ -140,9 +140,6 @@
- #undef JPEG_CJPEG_DJPEG
- #undef JPEG_INTERNALS
-
- -/* Hack for files produced by Wang Imaging application on Microsoft Windows */
- -extern void jpeg_reset_huff_decode(j_decompress_ptr);
- -
- /* PDFlib GmbH */
- #if defined(__ia64__) && defined (__linux__)
- #define PDFLIB_ALIGN16
- @@ -1085,17 +1082,6 @@
- buf += bytesperline;
- ++tif->tif_row;
- };
- -
- - /* BEWARE OF KLUDGE: If our input file was produced by Microsoft's Wang
- - Imaging for Windows application, the DC coefficients of
- - each JPEG image component (Y,Cb,Cr) must be reset at the end of each TIFF
- - "strip", and any JPEG data bits remaining in the current Byte of the
- - decoder's input buffer must be discarded. To do so, we create an "ad hoc"
- - interface in the "jdhuff.c" module of IJG JPEG Library Version 6 (module
- - "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and we
- - invoke that interface here after decoding each "strip".
- - */
- - if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d);
- return 1;
- }
-
- @@ -1184,17 +1170,6 @@
- buf += sp->bytesperline;
- ++tif->tif_row;
- };
- -
- - /* BEWARE OF KLUDGE: If our input file was produced by Microsoft's Wang
- - Imaging for Windows application, the DC coefficients of
- - each JPEG image component (Y,Cb,Cr) must be reset at the end of each TIFF
- - "strip", and any JPEG data bits remaining in the current Byte of the
- - decoder's input buffer must be discarded. To do so, we create an "ad hoc"
- - interface in the "jdhuff.c" module of IJG JPEG Library Version 6 (module
- - "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and we
- - invoke that interface here after decoding each "strip".
- - */
- - if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d);
- return 1;
- }
-
|