pdflib.patch 3.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123
  1. Index: config/mkmainlib.inc
  2. diff -Nau config/mkmainlib.inc.orig config/mkmainlib.inc
  3. --- config/mkmainlib.inc.orig 2004-01-26 14:30:23.000000000 +0100
  4. +++ config/mkmainlib.inc 2004-02-12 09:08:24.000000000 +0100
  5. @@ -28,7 +28,7 @@
  6. @-if test "$(WITH_SHARED)" = "no"; then \
  7. cp .libs/$(MAINLIBNAME) .libs/$(MAINLIBNAME)i;\
  8. fi
  9. - $(LIBTOOL) $(INSTALL_DATA) $(MAINLIBNAME) $(libdir);
  10. + $(LIBTOOL) --mode=install $(INSTALL_DATA) $(MAINLIBNAME) $(libdir);
  11. @-if test "$(WITH_SHARED)" = "yes"; then \
  12. $(LIBTOOL) -n --finish $(libdir);\
  13. else\
  14. Index: configure
  15. diff -Nau configure.orig configure
  16. --- configure.orig 2004-07-07 20:29:08.000000000 +0200
  17. +++ configure 2004-10-27 17:04:45.110483011 +0200
  18. @@ -8908,6 +8908,7 @@
  19. # zlib
  20. +if [ ".$FLATELIBINC" = . -a ".$FLATELIBLINK" = . ]; then
  21. if test -d libs/flate ; then
  22. FLATELIBINC="-I\$(top_builddir)/libs/flate"
  23. FLATELIBLINK="\$(top_builddir)/libs/flate/libz\$(LA)"
  24. @@ -8917,10 +8918,12 @@
  25. FLATELIBINC=""
  26. FLATELIBLINK=""
  27. fi
  28. +fi
  29. # pnglib
  30. +if [ ".$PNGLIBINC" = . -a ".$PNGLIBLINK" = . ]; then
  31. if test -d libs/png ; then
  32. PNGLIBINC="-I\$(top_builddir)/libs/png"
  33. PNGLIBLINK="\$(top_builddir)/libs/png/libpng\$(LA)"
  34. @@ -8930,10 +8933,12 @@
  35. PNGLIBINC=""
  36. PNGLIBLINK=""
  37. fi
  38. +fi
  39. # tifflib
  40. +if [ ".$TIFFLIBINC" = . -a ".$TIFFLIBLINK" = . ]; then
  41. if test -d libs/tiff ; then
  42. TIFFLIBINC="-I\$(top_builddir)/libs/tiff"
  43. TIFFLIBLINK="\$(top_builddir)/libs/tiff/libtiff\$(LA)"
  44. @@ -8943,10 +8948,12 @@
  45. TIFFLIBINC=""
  46. TIFFLIBLINK=""
  47. fi
  48. +fi
  49. # jpeglib
  50. +if [ ".$JPEGLIBINC" = . -a ".$JPEGLIBLINK" = . ]; then
  51. if test -d libs/jpeg ; then
  52. JPEGLIBINC="-I\$(top_builddir)/libs/jpeg"
  53. JPEGLIBLINK="\$(top_builddir)/libs/jpeg/libjpeg\$(LA)"
  54. @@ -8956,6 +8963,7 @@
  55. JPEGLIBINC=""
  56. JPEGLIBLINK=""
  57. fi
  58. +fi
  59. Index: libs/tiff/tif_ojpeg.c
  60. diff -Nau libs/tiff/tif_ojpeg.c.orig libs/tiff/tif_ojpeg.c
  61. --- libs/tiff/tif_ojpeg.c.orig 2004-07-07 20:29:14 +0200
  62. +++ libs/tiff/tif_ojpeg.c 2004-10-28 12:27:57 +0200
  63. @@ -140,9 +140,6 @@
  64. #undef JPEG_CJPEG_DJPEG
  65. #undef JPEG_INTERNALS
  66. -/* Hack for files produced by Wang Imaging application on Microsoft Windows */
  67. -extern void jpeg_reset_huff_decode(j_decompress_ptr);
  68. -
  69. /* PDFlib GmbH */
  70. #if defined(__ia64__) && defined (__linux__)
  71. #define PDFLIB_ALIGN16
  72. @@ -1085,17 +1082,6 @@
  73. buf += bytesperline;
  74. ++tif->tif_row;
  75. };
  76. -
  77. - /* BEWARE OF KLUDGE: If our input file was produced by Microsoft's Wang
  78. - Imaging for Windows application, the DC coefficients of
  79. - each JPEG image component (Y,Cb,Cr) must be reset at the end of each TIFF
  80. - "strip", and any JPEG data bits remaining in the current Byte of the
  81. - decoder's input buffer must be discarded. To do so, we create an "ad hoc"
  82. - interface in the "jdhuff.c" module of IJG JPEG Library Version 6 (module
  83. - "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and we
  84. - invoke that interface here after decoding each "strip".
  85. - */
  86. - if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d);
  87. return 1;
  88. }
  89. @@ -1184,17 +1170,6 @@
  90. buf += sp->bytesperline;
  91. ++tif->tif_row;
  92. };
  93. -
  94. - /* BEWARE OF KLUDGE: If our input file was produced by Microsoft's Wang
  95. - Imaging for Windows application, the DC coefficients of
  96. - each JPEG image component (Y,Cb,Cr) must be reset at the end of each TIFF
  97. - "strip", and any JPEG data bits remaining in the current Byte of the
  98. - decoder's input buffer must be discarded. To do so, we create an "ad hoc"
  99. - interface in the "jdhuff.c" module of IJG JPEG Library Version 6 (module
  100. - "jdshuff.c", if Ken Murchison's lossless-Huffman patch is applied), and we
  101. - invoke that interface here after decoding each "strip".
  102. - */
  103. - if (sp->is_WANG) jpeg_reset_huff_decode(&sp->cinfo.d);
  104. return 1;
  105. }