Fix libtiff compilation with VC6 after upgrade to 4.0.3.

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

diff --git a/src/tiff/libtiff/tif_predict.h b/src/tiff/libtiff/tif_predict.h
index 8563c83c8e70aee3263059926fe5782a2774eb45..91330ccec89c350f526831f8b8efa1b9457e1861 100644 (file)
--- a/src/tiff/libtiff/tif_predict.h
+++ b/src/tiff/libtiff/tif_predict.h
@@ -4,23 +4,23 @@
  * Copyright (c) 1995-1997 Sam Leffler
  * Copyright (c) 1995-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.
- * 
- * 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,
- * 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.
  */
 
@@ -36,29 +36,42 @@
  * the predictor code can cast tif_data to find its state.
  */
 typedef struct {
-       int             predictor;      /* predictor tag value */
-       int             stride;         /* sample stride over data */
-       tsize_t         rowsize;        /* tile/strip row size */
+       int             predictor;      /* predictor tag value */
+       tmsize_t        stride;         /* sample stride over data */
+       tmsize_t        rowsize;        /* tile/strip row size */
+
+       TIFFCodeMethod  encoderow;      /* parent codec encode/decode row */
+       TIFFCodeMethod  encodestrip;    /* parent codec encode/decode strip */
+       TIFFCodeMethod  encodetile;     /* parent codec encode/decode tile */ 
+       TIFFPostMethod  encodepfunc;    /* horizontal differencer */
 
-       TIFFPostMethod  pfunc;          /* horizontal differencer/accumulator */
-       TIFFCodeMethod  coderow;        /* parent codec encode/decode row */
-       TIFFCodeMethod  codestrip;      /* parent codec encode/decode strip */
-       TIFFCodeMethod  codetile;       /* parent codec encode/decode tile */
-       TIFFVGetMethod  vgetparent;     /* super-class method */
-       TIFFVSetMethod  vsetparent;     /* super-class method */
-       TIFFPrintMethod printdir;       /* super-class method */
-       TIFFBoolMethod  setupdecode;    /* super-class method */
-       TIFFBoolMethod  setupencode;    /* super-class method */
+       TIFFCodeMethod  decoderow;      /* parent codec encode/decode row */
+       TIFFCodeMethod  decodestrip;    /* parent codec encode/decode strip */
+       TIFFCodeMethod  decodetile;     /* parent codec encode/decode tile */ 
+       TIFFPostMethod  decodepfunc;    /* horizontal accumulator */
+
+       TIFFVGetMethod  vgetparent;     /* super-class method */
+       TIFFVSetMethod  vsetparent;     /* super-class method */
+       TIFFPrintMethod printdir;       /* super-class method */
+       TIFFBoolMethod  setupdecode;    /* super-class method */
+       TIFFBoolMethod  setupencode;    /* super-class method */
 } TIFFPredictorState;
 
 #if defined(__cplusplus)
 extern "C" {
 #endif
-extern int TIFFPredictorInit(TIFF*);
-extern int TIFFPredictorCleanup(TIFF*);
+extern int TIFFPredictorInit(TIFF*);
+extern int TIFFPredictorCleanup(TIFF*);
 #if defined(__cplusplus)
 }
 #endif
 #endif /* _TIFFPREDICT_ */
 
 /* vim: set ts=8 sts=8 sw=8 noet: */
+/*
+ * Local Variables:
+ * mode: c
+ * c-basic-offset: 8
+ * fill-column: 78
+ * End:
+ */