moved wxDash typedef to gdicmn.h

[wxWidgets.git] / src / tiff / tif_fax3.c

diff --git a/src/tiff/tif_fax3.c b/src/tiff/tif_fax3.c
index 4be62aedea671a4ce53fe80bc585a17c1a5d0797..d10ee1a2545a6ac7531bd05042100eedecb8800e 100644 (file)
--- a/src/tiff/tif_fax3.c
+++ b/src/tiff/tif_fax3.c
@@ -4,23 +4,23 @@
  * Copyright (c) 1990-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
  *
  * Copyright (c) 1990-1997 Sam Leffler
  * Copyright (c) 1991-1997 Silicon Graphics, Inc.
  *

- * Permission to use, copy, modify, distribute, and sell this software and 
+ * Permission to use, copy, modify, distribute, and sell this software and

  * its documentation for any purpose is hereby granted without fee, provided
  * that (i) the above copyright notices and this permission notice appear in
  * all copies of the software and related documentation, and (ii) the names of
  * Sam Leffler and Silicon Graphics may not be used in any advertising or
  * publicity relating to the software without the specific, prior written
  * permission of Sam Leffler and Silicon Graphics.
  * its documentation for any purpose is hereby granted without fee, provided
  * that (i) the above copyright notices and this permission notice appear in
  * all copies of the software and related documentation, and (ii) the names of
  * Sam Leffler and Silicon Graphics may not be used in any advertising or
  * publicity relating to the software without the specific, prior written
  * permission of Sam Leffler and Silicon Graphics.

- * 
- * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, 
- * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY 
- * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.  
- * 
+ *
+ * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ *

  * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
  * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
  * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
  * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR
  * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND,
  * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,

- * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF 
- * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE 
+ * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF
+ * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

  * OF THIS SOFTWARE.
  */
 
  * OF THIS SOFTWARE.
  */
 


@@ -85,13 +85,13 @@ typedef struct {
 #define        DecoderState(tif)       ((Fax3DecodeState*) Fax3State(tif))
 
 typedef struct {
 #define        DecoderState(tif)       ((Fax3DecodeState*) Fax3State(tif))
 
 typedef struct {

-       Fax3BaseState b;
-       int     data;                   /* current i/o byte */
-       int     bit;                    /* current i/o bit in byte */
-       enum { G3_1D, G3_2D } tag;      /* encoding state */
-       u_char* refline;                /* reference line for 2d decoding */
-       int     k;                      /* #rows left that can be 2d encoded */
-       int     maxk;                   /* max #rows that can be 2d encoded */
+    Fax3BaseState b;
+    int    data;                /* current i/o byte */
+    int    bit;                 /* current i/o bit in byte */
+    enum { G3_1D, G3_2D } tag;  /* encoding state */
+    u_char*    refline;         /* reference line for 2d decoding */
+    int    k;                   /* #rows left that can be 2d encoded */
+    int    maxk;                /* max #rows that can be 2d encoded */

 } Fax3EncodeState;
 #define        EncoderState(tif)       ((Fax3EncodeState*) Fax3State(tif))
 
 } Fax3EncodeState;
 #define        EncoderState(tif)       ((Fax3EncodeState*) Fax3State(tif))
 


@@ -182,7 +182,7 @@ Fax3PreDecode(TIFF* tif, tsample_t s)
  * overriding the definitions used by the decoder.
  */
 
  * overriding the definitions used by the decoder.
  */
 

-static void
+static void LINKAGEMODE

 Fax3Unexpected(const char* module, TIFF* tif, uint32 a0)
 {
        TIFFError(module, "%s: Bad code word at scanline %d (x %lu)",
 Fax3Unexpected(const char* module, TIFF* tif, uint32 a0)
 {
        TIFFError(module, "%s: Bad code word at scanline %d (x %lu)",


@@ -190,7 +190,7 @@ Fax3Unexpected(const char* module, TIFF* tif, uint32 a0)
 }
 #define        unexpected(table, a0)   Fax3Unexpected(module, tif, a0)
 
 }
 #define        unexpected(table, a0)   Fax3Unexpected(module, tif, a0)
 

-static void
+static void LINKAGEMODE

 Fax3Extension(const char* module, TIFF* tif, uint32 a0)
 {
        TIFFError(module,
 Fax3Extension(const char* module, TIFF* tif, uint32 a0)
 {
        TIFFError(module,


@@ -199,7 +199,7 @@ Fax3Extension(const char* module, TIFF* tif, uint32 a0)
 }
 #define        extension(a0)   Fax3Extension(module, tif, a0)
 
 }
 #define        extension(a0)   Fax3Extension(module, tif, a0)
 

-static void
+static void LINKAGEMODE

 Fax3BadLength(const char* module, TIFF* tif, uint32 a0, uint32 lastx)
 {
        TIFFWarning(module, "%s: %s at scanline %d (got %lu, expected %lu)",
 Fax3BadLength(const char* module, TIFF* tif, uint32 a0, uint32 lastx)
 {
        TIFFWarning(module, "%s: %s at scanline %d (got %lu, expected %lu)",


@@ -209,7 +209,7 @@ Fax3BadLength(const char* module, TIFF* tif, uint32 a0, uint32 lastx)
 }
 #define        badlength(a0,lastx)     Fax3BadLength(module, tif, a0, lastx)
 
 }
 #define        badlength(a0,lastx)     Fax3BadLength(module, tif, a0, lastx)
 

-static void
+static void LINKAGEMODE

 Fax3PrematureEOF(const char* module, TIFF* tif, uint32 a0)
 {
        TIFFWarning(module, "%s: Premature EOF at scanline %d (x %lu)",
 Fax3PrematureEOF(const char* module, TIFF* tif, uint32 a0)
 {
        TIFFWarning(module, "%s: Premature EOF at scanline %d (x %lu)",


@@ -222,7 +222,7 @@ Fax3PrematureEOF(const char* module, TIFF* tif, uint32 a0)
 /*
  * Decode the requested amount of G3 1D-encoded data.
  */
 /*
  * Decode the requested amount of G3 1D-encoded data.
  */

-static int
+static int LINKAGEMODE

 Fax3Decode1D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
 {
        DECLARE_STATE(tif, sp, "Fax3Decode1D");
 Fax3Decode1D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
 {
        DECLARE_STATE(tif, sp, "Fax3Decode1D");


@@ -262,7 +262,7 @@ Fax3Decode1D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
 /*
  * Decode the requested amount of G3 2D-encoded data.
  */
 /*
  * Decode the requested amount of G3 2D-encoded data.
  */

-static int
+static int LINKAGEMODE

 Fax3Decode2D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
 {
        DECLARE_STATE_2D(tif, sp, "Fax3Decode2D");
 Fax3Decode2D(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
 {
        DECLARE_STATE_2D(tif, sp, "Fax3Decode2D");


@@ -574,7 +574,7 @@ static const int _msbmask[9] =
  * the output stream.  Values are
  * assumed to be at most 16 bits.
  */
  * the output stream.  Values are
  * assumed to be at most 16 bits.
  */

-static void
+static void LINKAGEMODE

 Fax3PutBits(TIFF* tif, u_int bits, u_int length)
 {
        Fax3EncodeState* sp = EncoderState(tif);
 Fax3PutBits(TIFF* tif, u_int bits, u_int length)
 {
        Fax3EncodeState* sp = EncoderState(tif);


@@ -609,7 +609,7 @@ Fax3PutBits(TIFF* tif, u_int bits, u_int length)
  * appropriate table that holds the make-up and
  * terminating codes is supplied.
  */
  * appropriate table that holds the make-up and
  * terminating codes is supplied.
  */

-static void
+static void LINKAGEMODE

 putspan(TIFF* tif, int32 span, const tableentry* tab)
 {
        Fax3EncodeState* sp = EncoderState(tif);
 putspan(TIFF* tif, int32 span, const tableentry* tab)
 {
        Fax3EncodeState* sp = EncoderState(tif);


@@ -652,7 +652,7 @@ putspan(TIFF* tif, int32 span, const tableentry* tab)
  * here.  We also handle writing the tag bit for the next
  * scanline when doing 2d encoding.
  */
  * here.  We also handle writing the tag bit for the next
  * scanline when doing 2d encoding.
  */

-static void
+static void LINKAGEMODE

 Fax3PutEOL(TIFF* tif)
 {
        Fax3EncodeState* sp = EncoderState(tif);
 Fax3PutEOL(TIFF* tif)
 {
        Fax3EncodeState* sp = EncoderState(tif);


@@ -678,7 +678,12 @@ Fax3PutEOL(TIFF* tif)
        }
        code = EOL, length = 12;
        if (is2DEncoding(sp))
        }
        code = EOL, length = 12;
        if (is2DEncoding(sp))

+#if defined(__VISAGECPP30__)
+/* VA 3.0 is just plain wierd. */
+               code = (code<<1) | (sp->tag == Fax3EncodeState::G3_1D), length++;
+#else

                code = (code<<1) | (sp->tag == G3_1D), length++;
                code = (code<<1) | (sp->tag == G3_1D), length++;

+#endif

        _PutBits(tif, code, length);
 
        sp->data = data;
        _PutBits(tif, code, length);
 
        sp->data = data;


@@ -697,7 +702,12 @@ Fax3PreEncode(TIFF* tif, tsample_t s)
        assert(sp != NULL);
        sp->bit = 8;
        sp->data = 0;
        assert(sp != NULL);
        sp->bit = 8;
        sp->data = 0;

+#if defined(__VISAGECPP30__)
+/* VA 3.0 is just plain wierd. */
+       sp->tag = Fax3EncodeState::G3_1D;
+#else

        sp->tag = G3_1D;
        sp->tag = G3_1D;

+#endif

        /*
         * This is necessary for Group 4; otherwise it isn't
         * needed because the first scanline of each strip ends
        /*
         * This is necessary for Group 4; otherwise it isn't
         * needed because the first scanline of each strip ends


@@ -778,7 +788,7 @@ static      int32 find1span(u_char*, int32, int32);
  * table.  The ``base'' of the bit string is supplied
  * along with the start+end bit indices.
  */
  * table.  The ``base'' of the bit string is supplied
  * along with the start+end bit indices.
  */

-INLINE static int32
+INLINE static int32 LINKAGEMODE

 find0span(u_char* bp, int32 bs, int32 be)
 {
        int32 bits = be - bs;
 find0span(u_char* bp, int32 bs, int32 be)
 {
        int32 bits = be - bs;


@@ -837,7 +847,7 @@ find0span(u_char* bp, int32 bs, int32 be)
        return (span);
 }
 
        return (span);
 }
 

-INLINE static int32
+INLINE static int32 LINKAGEMODE

 find1span(u_char* bp, int32 bs, int32 be)
 {
        int32 bits = be - bs;
 find1span(u_char* bp, int32 bs, int32 be)
 {
        int32 bits = be - bs;


@@ -916,7 +926,7 @@ find1span(u_char* bp, int32 bs, int32 be)
  * a sequence of all-white or all-black spans
  * of pixels encoded with Huffman codes.
  */
  * a sequence of all-white or all-black spans
  * of pixels encoded with Huffman codes.
  */

-static int
+static int LINKAGEMODE

 Fax3Encode1DRow(TIFF* tif, u_char* bp, uint32 bits)
 {
        Fax3EncodeState* sp = EncoderState(tif);
 Fax3Encode1DRow(TIFF* tif, u_char* bp, uint32 bits)
 {
        Fax3EncodeState* sp = EncoderState(tif);


@@ -962,7 +972,7 @@ static const tableentry vcodes[7] = {
  * 2d-encode a row of pixels.  Consult the CCITT
  * documentation for the algorithm.
  */
  * 2d-encode a row of pixels.  Consult the CCITT
  * documentation for the algorithm.
  */

-static int
+static int LINKAGEMODE

 Fax3Encode2DRow(TIFF* tif, u_char* bp, u_char* rp, uint32 bits)
 {
 #define        PIXEL(buf,ix)   ((((buf)[(ix)>>3]) >> (7-((ix)&7))) & 1)
 Fax3Encode2DRow(TIFF* tif, u_char* bp, u_char* rp, uint32 bits)
 {
 #define        PIXEL(buf,ix)   ((((buf)[(ix)>>3]) >> (7-((ix)&7))) & 1)


@@ -1007,7 +1017,7 @@ Fax3Encode2DRow(TIFF* tif, u_char* bp, u_char* rp, uint32 bits)
 /*
  * Encode a buffer of pixels.
  */
 /*
  * Encode a buffer of pixels.
  */

-static int
+static int LINKAGEMODE

 Fax3Encode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
 {
        Fax3EncodeState* sp = EncoderState(tif);
 Fax3Encode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
 {
        Fax3EncodeState* sp = EncoderState(tif);


@@ -1017,17 +1027,32 @@ Fax3Encode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
                if ((sp->b.mode & FAXMODE_NOEOL) == 0)
                        Fax3PutEOL(tif);
                if (is2DEncoding(sp)) {
                if ((sp->b.mode & FAXMODE_NOEOL) == 0)
                        Fax3PutEOL(tif);
                if (is2DEncoding(sp)) {

+#if defined(__VISAGECPP30__)
+/* VA 3.0 is just plain wierd. */
+                       if (sp->tag == Fax3EncodeState::G3_1D) {
+#else

                        if (sp->tag == G3_1D) {
                        if (sp->tag == G3_1D) {

+#endif

                                if (!Fax3Encode1DRow(tif, bp, sp->b.rowpixels))
                                        return (0);
                                if (!Fax3Encode1DRow(tif, bp, sp->b.rowpixels))
                                        return (0);

+#if defined(__VISAGECPP30__)
+/* VA 3.0 is just plain wierd. */
+                               sp->tag = Fax3EncodeState::G3_2D;
+#else

                                sp->tag = G3_2D;
                                sp->tag = G3_2D;

+#endif

                        } else {
                                if (!Fax3Encode2DRow(tif, bp, sp->refline, sp->b.rowpixels))
                                        return (0);
                                sp->k--;
                        }
                        if (sp->k == 0) {
                        } else {
                                if (!Fax3Encode2DRow(tif, bp, sp->refline, sp->b.rowpixels))
                                        return (0);
                                sp->k--;
                        }
                        if (sp->k == 0) {

+#if defined(__VISAGECPP30__)
+/* VA 3.0 is just plain wierd. */
+                               sp->tag = Fax3EncodeState::G3_1D;
+#else

                                sp->tag = G3_1D;
                                sp->tag = G3_1D;

+#endif

                                sp->k = sp->maxk-1;
                        } else
                                _TIFFmemcpy(sp->refline, bp, sp->b.rowbytes);
                                sp->k = sp->maxk-1;
                        } else
                                _TIFFmemcpy(sp->refline, bp, sp->b.rowbytes);


@@ -1063,7 +1088,12 @@ Fax3Close(TIFF* tif)
                int i;
 
                if (is2DEncoding(sp))
                int i;
 
                if (is2DEncoding(sp))

+#if defined(__VISAGECPP30__)
+/* VA 3.0 is just plain wierd. */
+                       code = (code<<1) | (sp->tag == Fax3EncodeState::G3_1D), length++;
+#else

                        code = (code<<1) | (sp->tag == G3_1D), length++;
                        code = (code<<1) | (sp->tag == G3_1D), length++;

+#endif

                for (i = 0; i < 6; i++)
                        Fax3PutBits(tif, code, length);
                Fax3FlushBits(tif, sp);
                for (i = 0; i < 6; i++)
                        Fax3PutBits(tif, code, length);
                Fax3FlushBits(tif, sp);


@@ -1215,7 +1245,7 @@ Fax3VGetField(TIFF* tif, ttag_t tag, va_list ap)
        return (1);
 }
 
        return (1);
 }
 

-static void
+static void LINKAGEMODE

 Fax3PrintDir(TIFF* tif, FILE* fd, long flags)
 {
        Fax3BaseState* sp = Fax3State(tif);
 Fax3PrintDir(TIFF* tif, FILE* fd, long flags)
 {
        Fax3BaseState* sp = Fax3State(tif);


@@ -1271,7 +1301,7 @@ Fax3PrintDir(TIFF* tif, FILE* fd, long flags)
                    (u_long) sp->recvtime);
 }
 
                    (u_long) sp->recvtime);
 }
 

-static int
+static int LINKAGEMODE

 InitCCITTFax3(TIFF* tif)
 {
        Fax3BaseState* sp;
 InitCCITTFax3(TIFF* tif)
 {
        Fax3BaseState* sp;


@@ -1280,9 +1310,15 @@ InitCCITTFax3(TIFF* tif)
         * Allocate state block so tag methods have storage to record values.
         */
        if (tif->tif_mode == O_RDONLY)
         * Allocate state block so tag methods have storage to record values.
         */
        if (tif->tif_mode == O_RDONLY)

+#if defined(__VISAGECPP__)
+               tif->tif_data = (tidata_t)_TIFFmalloc(sizeof (Fax3DecodeState));
+       else
+               tif->tif_data = (tidata_t)_TIFFmalloc(sizeof (Fax3EncodeState));
+#else

                tif->tif_data = _TIFFmalloc(sizeof (Fax3DecodeState));
        else
                tif->tif_data = _TIFFmalloc(sizeof (Fax3EncodeState));
                tif->tif_data = _TIFFmalloc(sizeof (Fax3DecodeState));
        else
                tif->tif_data = _TIFFmalloc(sizeof (Fax3EncodeState));

+#endif

        if (tif->tif_data == NULL) {
                TIFFError("TIFFInitCCITTFax3",
                    "%s: No space for state block", tif->tif_name);
        if (tif->tif_data == NULL) {
                TIFFError("TIFFInitCCITTFax3",
                    "%s: No space for state block", tif->tif_name);


@@ -1354,7 +1390,7 @@ TIFFInitCCITTFax3(TIFF* tif, int scheme)
 /*
  * Decode the requested amount of G4-encoded data.
  */
 /*
  * Decode the requested amount of G4-encoded data.
  */

-static int
+static int LINKAGEMODE

 Fax4Decode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
 {
        DECLARE_STATE_2D(tif, sp, "Fax4Decode");
 Fax4Decode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
 {
        DECLARE_STATE_2D(tif, sp, "Fax4Decode");


@@ -1394,7 +1430,7 @@ Fax4Decode(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
 /*
  * Encode the requested amount of data.
  */
 /*
  * Encode the requested amount of data.
  */

-static int
+static int LINKAGEMODE

 Fax4Encode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
 {
        Fax3EncodeState *sp = EncoderState(tif);
 Fax4Encode(TIFF* tif, tidata_t bp, tsize_t cc, tsample_t s)
 {
        Fax3EncodeState *sp = EncoderState(tif);


@@ -1454,7 +1490,7 @@ TIFFInitCCITTFax4(TIFF* tif, int scheme)
 /*
  * Decode the requested amount of RLE-encoded data.
  */
 /*
  * Decode the requested amount of RLE-encoded data.
  */

-static int
+static int LINKAGEMODE

 Fax3DecodeRLE(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
 {
        DECLARE_STATE(tif, sp, "Fax3DecodeRLE");
 Fax3DecodeRLE(TIFF* tif, tidata_t buf, tsize_t occ, tsample_t s)
 {
        DECLARE_STATE(tif, sp, "Fax3DecodeRLE");