cheng/libtiff
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* libtiff/tif_ojpeg.c, libtiff/tif_pixarlog.c,

Browse Source 
libtiff/tif_zip.c: fix build errors for VC6
        http://bugzilla.maptools.org/show_bug.cgi?id=2105
This commit is contained in:
Lee Howard 2010-12-11 23:52:27 +00:00
parent 7335412b5a
commit 6975482a3a
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2010-12-11 Lee Howard <faxguy@howardsilvan.com>
* libtiff/tif_ojpeg.c, libtiff/tif_pixarlog.c,
libtiff/tif_zip.c: fix build errors for VC6
http://bugzilla.maptools.org/show_bug.cgi?id=2105
2010-12-11 Lee Howard <faxguy@howardsilvan.com>
* libtiff/tif_stream.cxx: warnings cleanup

12
libtiff/tif_ojpeg.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_ojpeg.c,v 1.50 2010-12-11 21:23:21 faxguy Exp $ */
/* $Id: tif_ojpeg.c,v 1.51 2010-12-11 23:52:27 faxguy Exp $ */
/* WARNING: The type of JPEG encapsulation defined by the TIFF Version 6.0
specification is now totally obsolete and deprecated for new applications and
@ -598,28 +598,28 @@ OJPEGPrintDir(TIFF* tif, FILE* fd, long flags)
(void)flags;
assert(sp!=NULL);
if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGINTERCHANGEFORMAT))
fprintf(fd," JpegInterchangeFormat: %llu\n",(unsigned long long)sp->jpeg_interchange_format);
fprintf(fd," JpegInterchangeFormat: " TIFF_UINT64_FORMAT "\n",(TIFF_UINT64_T)sp->jpeg_interchange_format);
if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGINTERCHANGEFORMATLENGTH))
fprintf(fd," JpegInterchangeFormatLength: %llu\n",(unsigned long long)sp->jpeg_interchange_format_length);
fprintf(fd," JpegInterchangeFormatLength: " TIFF_UINT64_FORMAT "\n",(TIFF_UINT64_T)sp->jpeg_interchange_format_length);
if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGQTABLES))
{
fprintf(fd," JpegQTables:");
for (m=0; m<sp->qtable_offset_count; m++)
fprintf(fd," %llu",(unsigned long long)sp->qtable_offset[m]);
fprintf(fd," " TIFF_UINT64_FORMAT,(TIFF_UINT64_T)sp->qtable_offset[m]);
fprintf(fd,"\n");
}
if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGDCTABLES))
{
fprintf(fd," JpegDcTables:");
for (m=0; m<sp->dctable_offset_count; m++)
fprintf(fd," %llu",(unsigned long long)sp->dctable_offset[m]);
fprintf(fd," " TIFF_UINT64_FORMAT,(TIFF_UINT64_T)sp->dctable_offset[m]);
fprintf(fd,"\n");
}
if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGACTABLES))
{
fprintf(fd," JpegAcTables:");
for (m=0; m<sp->actable_offset_count; m++)
fprintf(fd," %llu",(unsigned long long)sp->actable_offset[m]);
fprintf(fd," " TIFF_UINT64_FORMAT,(TIFF_UINT64_T)sp->actable_offset[m]);
fprintf(fd,"\n");
}
if (TIFFFieldSet(tif,FIELD_OJPEG_JPEGPROC))

6
libtiff/tif_pixarlog.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_pixarlog.c,v 1.33 2010-03-10 18:56:49 bfriesen Exp $ */
/* $Id: tif_pixarlog.c,v 1.34 2010-12-11 23:52:27 faxguy Exp $ */
/*
* Copyright (c) 1996-1997 Sam Leffler
@ -785,8 +785,8 @@ PixarLogDecode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s)
/* hopefully, we got all the bytes we needed */
if (sp->stream.avail_out != 0) {
TIFFErrorExt(tif->tif_clientdata, module,
"Not enough data at scanline %lu (short %llu bytes)",
(unsigned long) tif->tif_row, (unsigned long long) sp->stream.avail_out);
"Not enough data at scanline %lu (short " TIFF_UINT64_FORMAT " bytes)",
(unsigned long) tif->tif_row, (TIFF_UINT64_T) sp->stream.avail_out);
return (0);
}

6
libtiff/tif_zip.c
View File

@ -1,4 +1,4 @@
/* $Id: tif_zip.c,v 1.29 2010-03-10 18:56:49 bfriesen Exp $ */
/* $Id: tif_zip.c,v 1.30 2010-12-11 23:52:27 faxguy Exp $ */
/*
* Copyright (c) 1995-1997 Sam Leffler
@ -184,8 +184,8 @@ ZIPDecode(TIFF* tif, uint8* op, tmsize_t occ, uint16 s)
} while (sp->stream.avail_out > 0);
if (sp->stream.avail_out != 0) {
TIFFErrorExt(tif->tif_clientdata, module,
"Not enough data at scanline %lu (short %llu bytes)",
(unsigned long) tif->tif_row, (unsigned long long) sp->stream.avail_out);
"Not enough data at scanline %lu (short " TIFF_UINT64_FORMAT " bytes)",
(unsigned long) tif->tif_row, (TIFF_UINT64_T) sp->stream.avail_out);
return (0);
}
return (1);