Added wxRichTextTableBlock class to help with table UI operations

[wxWidgets.git] / src / tiff / libtiff / tif_fax3.h

diff --git a/src/tiff/libtiff/tif_fax3.h b/src/tiff/libtiff/tif_fax3.h
index b218961dbe09013386b593a28ae5b6b0e8421520..679966d087f268aee1de8b98a21c2a51750edf1e 100644 (file)
--- a/src/tiff/libtiff/tif_fax3.h
+++ b/src/tiff/libtiff/tif_fax3.h
@@ -1,4 +1,3 @@
-/* $Id$ */

 
 /*
  * Copyright (c) 1990-1997 Sam Leffler
 
 /*
  * Copyright (c) 1990-1997 Sam Leffler


@@ -52,7 +51,7 @@
  * data in the run array as needed (e.g. to append zero runs to bring
  * the count up to a nice multiple).
  */
  * data in the run array as needed (e.g. to append zero runs to bring
  * the count up to a nice multiple).
  */

-typedef        void (*TIFFFaxFillFunc)(unsigned char*, uint32*, uint32*, uint32);
+typedef void (*TIFFFaxFillFunc)(unsigned char*, uint32*, uint32*, uint32);

 
 /*
  * The default run filler; made external for other decoders.
 
 /*
  * The default run filler; made external for other decoders.


@@ -60,36 +59,36 @@ typedef     void (*TIFFFaxFillFunc)(unsigned char*, uint32*, uint32*, uint32);
 #if defined(__cplusplus)
 extern "C" {
 #endif
 #if defined(__cplusplus)
 extern "C" {
 #endif

-extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32);
+extern void _TIFFFax3fillruns(unsigned char*, uint32*, uint32*, uint32);

 #if defined(__cplusplus)
 }
 #endif
 
 
 /* finite state machine codes */
 #if defined(__cplusplus)
 }
 #endif
 
 
 /* finite state machine codes */

-#define S_Null         0
-#define S_Pass         1
-#define S_Horiz                2
-#define S_V0           3
-#define S_VR           4
-#define S_VL           5
-#define S_Ext          6
-#define S_TermW                7
-#define S_TermB                8
-#define S_MakeUpW      9
-#define S_MakeUpB      10
-#define S_MakeUp       11
-#define S_EOL          12
+#define S_Null     0
+#define S_Pass     1
+#define S_Horiz    2
+#define S_V0       3
+#define S_VR       4
+#define S_VL       5
+#define S_Ext      6
+#define S_TermW    7
+#define S_TermB    8
+#define S_MakeUpW  9
+#define S_MakeUpB  10
+#define S_MakeUp   11
+#define S_EOL      12

 
 

-typedef struct {               /* state table entry */
-       unsigned char State;    /* see above */
-       unsigned char Width;    /* width of code in bits */
-       uint32  Param;          /* unsigned 32-bit run length in bits */
+typedef struct {                /* state table entry */
+       unsigned char State;    /* see above */
+       unsigned char Width;    /* width of code in bits */
+       uint32 Param;           /* unsigned 32-bit run length in bits */

 } TIFFFaxTabEnt;
 
 } TIFFFaxTabEnt;
 

-extern const TIFFFaxTabEnt TIFFFaxMainTable[];
-extern const TIFFFaxTabEnt TIFFFaxWhiteTable[];
-extern const TIFFFaxTabEnt TIFFFaxBlackTable[];
+extern const TIFFFaxTabEnt TIFFFaxMainTable[];
+extern const TIFFFaxTabEnt TIFFFaxWhiteTable[];
+extern const TIFFFaxTabEnt TIFFFaxBlackTable[];

 
 /*
  * The following macros define the majority of the G3/G4 decoder
 
 /*
  * The following macros define the majority of the G3/G4 decoder


@@ -478,6 +477,12 @@ done1d:                                                                    \
            break;                                                      \
        case S_VL:                                                      \
            CHECK_b1;                                                   \
            break;                                                      \
        case S_VL:                                                      \
            CHECK_b1;                                                   \

+           if (b1 <= (int) (a0 + TabEnt->Param)) {                     \
+               if (b1 < (int) (a0 + TabEnt->Param) || pa != thisrun) { \
+                   unexpected("VL", a0);                               \
+                   goto eol2d;                                         \
+               }                                                       \
+           }                                                           \

            SETVALUE(b1 - a0 - TabEnt->Param);                          \
            b1 -= *--pb;                                                \
            break;                                                      \
            SETVALUE(b1 - a0 - TabEnt->Param);                          \
            b1 -= *--pb;                                                \
            break;                                                      \


@@ -523,3 +528,10 @@ eol2d:                                                                     \
     CLEANUP_RUNS();                                                    \
 } while (0)
 #endif /* _FAX3_ */
     CLEANUP_RUNS();                                                    \
 } while (0)
 #endif /* _FAX3_ */

+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 8
+ * fill-column: 78
+ * End:
+ */