[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kpdf
From:       Albert Astals Cid <tsdgeos () terra ! es>
Date:       2005-04-14 18:50:08
Message-ID: 20050414185008.097265FA () office ! kde ! org
[Download RAW message or body]

CVS commit by aacid: 

Use libjpeg for dct streams, libjpeg has probably had more attention that xpdf code \
and also it makes a pdf work that previously was not working so this is a god change \
                TM, just wondering if i should backport or not.
BUGS: 87766


  A            xpdf/xpdf/DCTStream.cc   1.1 [UNKNOWN]
  A            xpdf/xpdf/DCTStream.h   1.1 [UNKNOWN]
  M +16 -0     configure.in.in   1.22
  M +2 -2      xpdf/xpdf/Makefile.am   1.6
  M +3 -1      xpdf/xpdf/Stream.cc   1.2
  M +4 -0      xpdf/xpdf/Stream.h   1.2


--- kdegraphics/kpdf/configure.in.in  #1.21:1.22
@@ -28,5 +28,8 @@
   else
     AC_MSG_WARN([You need at least libfreetype 2.0.5])
+    DO_NOT_COMPILE="$DO_NOT_COMPILE kpdf"
   fi
+else
+  DO_NOT_COMPILE="$DO_NOT_COMPILE kpdf"
 fi
 
@@ -51,4 +54,17 @@
 fi
 
+dnl ##### Check for libjpeg
+AC_CHECK_LIB([jpeg], [jpeg_destroy_decompress],HAVE_LIBJPEG=yes,HAVE_LIBJPEG=no)
+if test HAVE_LIBJPEG = yes; then
+  AC_CHECK_HEADERS([jpeglib.h],,HAVE_LIBJPEG=no)
+fi
+
+if test HAVE_LIBJPEG = yes; then
+  LIBJPEG_LIBS="-ljpeg"
+  AC_SUBST(LIBJPEG_LIBS)
+else
+  DO_NOT_COMPILE="$DO_NOT_COMPILE kpdf"
+fi
+
 
 dnl ##### Check for libpaper (Debian).

--- kdegraphics/kpdf/xpdf/xpdf/Makefile.am  #1.5:1.6
@@ -2,7 +2,7 @@
 
 libxpdf_la_LDFLAGS = $(all_libraries)
-libxpdf_la_LIBADD = $(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) \
../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la  +libxpdf_la_LIBADD = \
$(LIB_X11) $(LIBFREETYPE_LIBS) $(LIBPAPER_LIBS) $(XFT_LIBS) $(LIBJPEG_LIBS) \
../goo/libgoo.la ../fofi/libfofi.la ../splash/libsplash.la   libxpdf_la_SOURCES = \
                Annot.cc Array.cc BuiltinFont.cc BuiltinFontTables.cc \
-     Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc \
+     Catalog.cc CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc DCTStream.cc \
      FontEncodingTables.cc Function.cc Gfx.cc \
      GfxFont.cc GfxState.cc GlobalParams.cc JArithmeticDecoder.cc \

--- kdegraphics/kpdf/xpdf/xpdf/Stream.cc  #1.1:1.2
@@ -33,4 +33,5 @@
 #include "JPXStream.h"
 #include "Stream-CCITT.h"
+#include "DCTStream.h"
 
 #ifdef __DJGPP__
@@ -1787,4 +1788,5 @@ GBool CCITTFaxStream::isBinary(GBool /*l
 }
 
+#if 0
 //------------------------------------------------------------------------
 // DCTStream
@@ -3177,5 +3179,5 @@ GBool DCTStream::isBinary(GBool /*last*/
   return str->isBinary(gTrue);
 }
-
+#endif
 //------------------------------------------------------------------------
 // FlateStream

--- kdegraphics/kpdf/xpdf/xpdf/Stream.h  #1.1:1.2
@@ -535,4 +535,7 @@ private:
 };
 
+
+#if 0
+
 //------------------------------------------------------------------------
 // DCTStream
@@ -635,4 +638,5 @@ private:
   int read16();
 };
+#endif
 
 //------------------------------------------------------------------------


[prev in list] [next in list] [prev in thread] [next in thread]