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.

4 files changed, 9 insertions, 20 deletions

diff --git a/poppler/DCTStream.cc b/poppler/DCTStream.cc
index 6c7a4365..70fc5b27 100644
--- a/poppler/DCTStream.cc
+++ b/poppler/DCTStream.cc
@@ -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 @@ static void str_term_source(j_decompress_ptr cinfo)
 {
 }
 
-DCTStream::DCTStream(Stream *strA):
+DCTStream::DCTStream(Stream *strA, int colorXformA) :
   FilterStream(strA) {
   init();
 }
@@ -171,5 +168,3 @@ GooString *DCTStream::getPSFilter(int psLevel, char *indent) {
 GBool DCTStream::isBinary(GBool last) {
   return str->isBinary(gTrue);
 }
-
-#endif // this is the #if 0 endif
\ No newline at end of file
diff --git a/poppler/DCTStream.h b/poppler/DCTStream.h
index 2fbc09c3..4a977917 100644
--- a/poppler/DCTStream.h
+++ b/poppler/DCTStream.h
@@ -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 @@ struct str_src_mgr {
 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 @@ private:
   JSAMPARRAY row_buffer;
 };
 
-#endif // this is the #if 0 endif
-
 #endif 
diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index b95b237d..c603cb40 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -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 @@ GBool CCITTFaxStream::isBinary(GBool last) {
 }
 
 #warning LIBJPEG DCTSTream is broken, fix it
-// #ifndef ENABLE_LIBJPEG
+#ifndef ENABLE_LIBJPEG
 
 //------------------------------------------------------------------------
 // DCTStream
@@ -3254,7 +3253,7 @@ GBool DCTStream::isBinary(GBool last) {
   return str->isBinary(gTrue);
 }
 
-// #endif
+#endif
 
 #ifndef ENABLE_ZLIB
 //------------------------------------------------------------------------
diff --git a/poppler/Stream.h b/poppler/Stream.h
index 3a220186..26bda0fd 100644
--- a/poppler/Stream.h
+++ b/poppler/Stream.h
@@ -541,7 +541,7 @@ private:
 };
 
 #warning LIBJPEG DCTSTream is broken, fix it
-// #ifndef ENABLE_LIBJPEG
+#ifndef ENABLE_LIBJPEG
 //------------------------------------------------------------------------
 // DCTStream
 //------------------------------------------------------------------------
@@ -646,7 +646,7 @@ private:
   int read16();
 };
 
-// #endif
+#endif
 
 #ifndef ENABLE_ZLIB
 //------------------------------------------------------------------------