diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-06 14:33:16 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-06 14:33:34 +0100 |
| commit | f2dbc67c2b032a5f27d0224e020fb6dfcd3fd142 (patch) | |
| tree | c5c195998f538fd7b9aa1382ced53caf2dec3926 /src/3rdparty/libtiff/libtiff/tif_predict.h | |
| parent | d2306d74850986692c02b70df0d7a6a6e933d0dc (diff) | |
| parent | 03e507c8f3816053257b3c351d79c494b6f9174d (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: I9cf7f04769944935d7b836453c7982839857a909
Diffstat (limited to 'src/3rdparty/libtiff/libtiff/tif_predict.h')
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_predict.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_predict.h b/src/3rdparty/libtiff/libtiff/tif_predict.h index dc7144c..6c68e21 100644 --- a/src/3rdparty/libtiff/libtiff/tif_predict.h +++ b/src/3rdparty/libtiff/libtiff/tif_predict.h @@ -1,4 +1,4 @@ -/* $Id: tif_predict.h,v 1.8 2010-03-10 18:56:49 bfriesen Exp $ */ +/* $Id: tif_predict.h,v 1.9 2016-10-31 17:24:26 erouault Exp $ */ /* * Copyright (c) 1995-1997 Sam Leffler @@ -30,6 +30,8 @@ * ``Library-private'' Support for the Predictor Tag */ +typedef int (*TIFFEncodeDecodeMethod)(TIFF* tif, uint8* buf, tmsize_t size); + /* * Codecs that want to support the Predictor tag must place * this structure first in their private state block so that @@ -43,12 +45,12 @@ typedef struct { 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 */ + TIFFEncodeDecodeMethod encodepfunc; /* horizontal differencer */ 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 */ + TIFFEncodeDecodeMethod decodepfunc; /* horizontal accumulator */ TIFFVGetMethod vgetparent; /* super-class method */ TIFFVSetMethod vsetparent; /* super-class method */ |