upgraded to xpdf-3.01pl1

[swftools.git] / pdf2swf / xpdf / JPXStream.h

diff --git a/pdf2swf/xpdf/JPXStream.h b/pdf2swf/xpdf/JPXStream.h
index eb84fe6..e64731d 100644 (file)
--- a/pdf2swf/xpdf/JPXStream.h
+++ b/pdf2swf/xpdf/JPXStream.h
@@ -44,18 +44,22 @@ enum JPXColorSpaceType {
   jpxCSYPbPr1250 = 24
 };
 
+struct JPXColorSpecCIELab {
+  Guint rl, ol, ra, oa, rb, ob, il;
+};
+
+struct JPXColorSpecEnumerated {
+  JPXColorSpaceType type;      // color space type
+  union {
+    JPXColorSpecCIELab cieLab;
+  };
+};
+
 struct JPXColorSpec {
   Guint meth;                  // method
   int prec;                    // precedence
   union {
-    struct {
-      JPXColorSpaceType type;  // color space type
-      union {
-       struct {
-         Guint rl, ol, ra, oa, rb, ob, il;
-       } cieLab;
-      };
-    } enumerated;
+    JPXColorSpecEnumerated enumerated;
   };
 };
 
@@ -135,6 +139,8 @@ struct JPXCodeBlock {
 
   //----- coefficient data
   JPXCoeff *coeffs;            // the coefficients
+  JArithmeticDecoder           // arithmetic decoder
+    *arithDecoder;
   JArithmeticDecoderStats      // arithmetic decoder stats
     *stats;
 };
@@ -275,10 +281,13 @@ public:
   virtual int lookChar();
   virtual GString *getPSFilter(int psLevel, char *indent);
   virtual GBool isBinary(GBool last = gTrue);
+  virtual void getImageParams(int *bitsPerComponent,
+                             StreamColorSpaceMode *csMode);
 
 private:
 
   void fillReadBuf();
+  void getImageParams2(int *bitsPerComponent, StreamColorSpaceMode *csMode);
   GBool readBoxes();
   GBool readColorSpecBox(Guint dataLen);
   GBool readCodestream(Guint len);