[poppler] poppler/poppler: DCTStream.cc, 1.5.4.1, 1.5.4.2 DCTStream.h, 1.6.4.1, 1.6.4.2 Stream.cc, 1.15.2.1, 1.15.2.2 Stream.h, 1.11.2.1, 1.11.2.2

[Jeff Muizelaar]

Update of /cvs/poppler/poppler/poppler
In directory kemper:/tmp/cvs-serv11545/poppler

Modified Files:
      Tag: xpdf302merge
	DCTStream.cc DCTStream.h Stream.cc Stream.h 
Log Message:
Get DCTStream compiling again.

It doesn't do anything with the ColorTransform parameter yet, but we have
a test case for that now so it can be fixed later.


Index: DCTStream.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/DCTStream.cc,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -d -r1.5.4.1 -r1.5.4.2
--- DCTStream.cc	6 Apr 2007 14:22:23 -0000	1.5.4.1
+++ DCTStream.cc	14 Apr 2007 19:56:01 -0000	1.5.4.2
@@ -6,9 +6,6 @@
 //
 //========================================================================
 
-#warning LIBJPEG DCTSTream is broken, fix it
-#if 0
-
 #include "DCTStream.h"
 
 static void str_init_source(j_decompress_ptr cinfo)
@@ -55,7 +52,7 @@
 {
 }
 
-DCTStream::DCTStream(Stream *strA):
+DCTStream::DCTStream(Stream *strA, int colorXformA) :
   FilterStream(strA) {
   init();
 }
@@ -171,5 +168,3 @@
 GBool DCTStream::isBinary(GBool last) {
   return str->isBinary(gTrue);
 }
-
-#endif // this is the #if 0 endif
\ No newline at end of file

Index: DCTStream.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/DCTStream.h,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -u -d -r1.6.4.1 -r1.6.4.2
--- DCTStream.h	6 Apr 2007 14:22:23 -0000	1.6.4.1
+++ DCTStream.h	14 Apr 2007 19:56:01 -0000	1.6.4.2
@@ -10,9 +10,6 @@
 #define DCTSTREAM_H
 #include <config.h>
 
-#warning LIBJPEG DCTSTream is broken, fix it
-#if 0
-
 #ifdef USE_GCC_PRAGMAS
 #pragma interface
 #endif
@@ -53,7 +50,7 @@
 class DCTStream: public FilterStream {
 public:
 
-  DCTStream(Stream *strA);
+  DCTStream(Stream *strA, int colorXformA);
   virtual ~DCTStream();
   virtual StreamKind getKind() { return strDCT; }
   virtual void reset();
@@ -73,6 +70,4 @@
   JSAMPARRAY row_buffer;
 };
 
-#endif // this is the #if 0 endif
-
 #endif 

Index: Stream.cc
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Stream.cc,v
retrieving revision 1.15.2.1
retrieving revision 1.15.2.2
diff -u -d -r1.15.2.1 -r1.15.2.2
--- Stream.cc	6 Apr 2007 14:22:23 -0000	1.15.2.1
+++ Stream.cc	14 Apr 2007 19:56:01 -0000	1.15.2.2
@@ -33,10 +33,9 @@
 #include "JPXStream.h"
 #include "Stream-CCITT.h"
 
-#warning LIBJPEG DCTSTream is broken, fix it
-// #ifdef ENABLE_LIBJPEG
-// #include "DCTStream.h"
-// #endif
+#ifdef ENABLE_LIBJPEG
+#include "DCTStream.h"
+#endif
 
 #ifdef ENABLE_ZLIB
 #include "FlateStream.h"
@@ -1837,7 +1836,7 @@
 }
 
 #warning LIBJPEG DCTSTream is broken, fix it
-// #ifndef ENABLE_LIBJPEG
+#ifndef ENABLE_LIBJPEG
 
 //------------------------------------------------------------------------
 // DCTStream
@@ -3254,7 +3253,7 @@
   return str->isBinary(gTrue);
 }
 
-// #endif
+#endif
 
 #ifndef ENABLE_ZLIB
 //------------------------------------------------------------------------

Index: Stream.h
===================================================================
RCS file: /cvs/poppler/poppler/poppler/Stream.h,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -u -d -r1.11.2.1 -r1.11.2.2
--- Stream.h	6 Apr 2007 14:22:23 -0000	1.11.2.1
+++ Stream.h	14 Apr 2007 19:56:01 -0000	1.11.2.2
@@ -541,7 +541,7 @@
 };
 
 #warning LIBJPEG DCTSTream is broken, fix it
-// #ifndef ENABLE_LIBJPEG
+#ifndef ENABLE_LIBJPEG
 //------------------------------------------------------------------------
 // DCTStream
 //------------------------------------------------------------------------
@@ -646,7 +646,7 @@
   int read16();
 };
 
-// #endif
+#endif
 
 #ifndef ENABLE_ZLIB
 //------------------------------------------------------------------------