diff options
| author | Joris Van Damme <joris.at.lebbeke@skynet.be> | 2007-04-04 04:16:07 +0000 |
|---|---|---|
| committer | Joris Van Damme <joris.at.lebbeke@skynet.be> | 2007-04-04 04:16:07 +0000 |
| commit | 126f04ce5e4f0b6dff7afa955d4e01eada4df292 (patch) | |
| tree | 4654dbda2aee3793756ac7511cf39e40b84a49c2 /libtiff/tif_compress.c | |
| parent | 7c0eb6eb47661fc3ff38d52dacafa13eb6a39923 (diff) | |
| download | libtiff-git-126f04ce5e4f0b6dff7afa955d4e01eada4df292.tar.gz | |
BigTIFF upgrade in progress - widespread temp mess - does not compile now
Diffstat (limited to 'libtiff/tif_compress.c')
| -rw-r--r-- | libtiff/tif_compress.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libtiff/tif_compress.c b/libtiff/tif_compress.c index b254c882..aeef1697 100644 --- a/libtiff/tif_compress.c +++ b/libtiff/tif_compress.c @@ -1,4 +1,4 @@ -/* $Id: tif_compress.c,v 1.15 2007-03-31 01:41:10 joris Exp $ */ +/* $Id: tif_compress.c,v 1.16 2007-04-04 04:16:07 joris Exp $ */ /* * Copyright (c) 1988-1997 Sam Leffler @@ -49,21 +49,21 @@ TIFFNoEncode(TIFF* tif, const char* method) } int -_TIFFNoRowEncode(TIFF* tif, uint8* pp, uint64 cc, uint16 s) +_TIFFNoRowEncode(TIFF* tif, uint8* pp, tmsize_t cc, uint16 s) { (void) pp; (void) cc; (void) s; return (TIFFNoEncode(tif, "scanline")); } int -_TIFFNoStripEncode(TIFF* tif, uint8* pp, uint64 cc, uint16 s) +_TIFFNoStripEncode(TIFF* tif, uint8* pp, tmsize_t cc, uint16 s) { (void) pp; (void) cc; (void) s; return (TIFFNoEncode(tif, "strip")); } int -_TIFFNoTileEncode(TIFF* tif, uint8* pp, uint64 cc, uint16 s) +_TIFFNoTileEncode(TIFF* tif, uint8* pp, tmsize_t cc, uint16 s) { (void) pp; (void) cc; (void) s; return (TIFFNoEncode(tif, "tile")); @@ -86,21 +86,21 @@ TIFFNoDecode(TIFF* tif, const char* method) } int -_TIFFNoRowDecode(TIFF* tif, uint8* pp, uint64 cc, uint16 s) +_TIFFNoRowDecode(TIFF* tif, uint8* pp, tmsize_t cc, uint16 s) { (void) pp; (void) cc; (void) s; return (TIFFNoDecode(tif, "scanline")); } int -_TIFFNoStripDecode(TIFF* tif, uint8* pp, uint64 cc, uint16 s) +_TIFFNoStripDecode(TIFF* tif, uint8* pp, tmsize_t cc, uint16 s) { (void) pp; (void) cc; (void) s; return (TIFFNoDecode(tif, "strip")); } int -_TIFFNoTileDecode(TIFF* tif, uint8* pp, uint64 cc, uint16 s) +_TIFFNoTileDecode(TIFF* tif, uint8* pp, tmsize_t cc, uint16 s) { (void) pp; (void) cc; (void) s; return (TIFFNoDecode(tif, "tile")); @@ -139,7 +139,7 @@ _TIFFSetDefaultCompressionState(TIFF* tif) tif->tif_preencode = _TIFFNoPreCode; tif->tif_postencode = _TIFFtrue; tif->tif_encoderow = _TIFFNoRowEncode; - tif->tif_encodestrip = _TIFFNoStripEncode; + tif->tif_encodestrip = _TIFFNoStripEncode; tif->tif_encodetile = _TIFFNoTileEncode; tif->tif_close = _TIFFvoid; tif->tif_seek = _TIFFNoSeek; @@ -197,9 +197,9 @@ TIFFRegisterCODEC(uint16 scheme, const char* name, TIFFInitMethod init) _TIFFmalloc(sizeof (codec_t) + sizeof (TIFFCodec) + strlen(name)+1); if (cd != NULL) { - cd->info = (TIFFCodec*) ((tidata_t) cd + sizeof (codec_t)); + cd->info = (TIFFCodec*) ((uint8*) cd + sizeof (codec_t)); cd->info->name = (char*) - ((tidata_t) cd->info + sizeof (TIFFCodec)); + ((uint8*) cd->info + sizeof (TIFFCodec)); strcpy(cd->info->name, name); cd->info->scheme = scheme; cd->info->init = init; @@ -269,7 +269,7 @@ TIFFGetConfiguredCODECs() return NULL; } codecs = new_codecs; - _TIFFmemcpy(codecs + i - 1, (const tdata_t)c, sizeof(TIFFCodec)); + _TIFFmemcpy(codecs + i - 1, (const void*)c, sizeof(TIFFCodec)); i++; } } |