← Back to branch summary

~ubuntu-branches/debian/sid/gdal/sid

« back to all changes in this revision

Viewing changes to frmts/gtiff/libtiff/tif_zip.c

  • Committer: Package Import Robot
  • Author(s): Francesco Paolo Lovergine
  • Date: 2012-05-07 15:04:42 UTC
  • mfrom: (5.5.16 experimental)
  • Revision ID: package-import@ubuntu.com-20120507150442-2eks97loeh6rq005
Tags: 1.9.0-1
* Ready for sid, starting transition.
* All symfiles updated to latest builds.
* Added dh_numpy call in debian/rules to depend on numpy ABI.
* Policy bumped to 3.9.3, no changes required.

Show diffs side-by-side

added added

removed removed

Lines of Context:
frmts/gtiff/libtiff/tif_zip.c
1
 
/* $Id: tif_zip.c,v 1.28 2007/11/02 00:25:25 fwarmerdam Exp $ */
 
1
/* $Id: tif_zip.c,v 1.31 2011-01-06 16:00:23 fwarmerdam Exp $ */
2
2
 
3
3
/*
4
4
 * Copyright (c) 1995-1997 Sam Leffler
153
153
        assert(sp != NULL);
154
154
        assert(sp->state == ZSTATE_INIT_DECODE);
155
155
 
 
156
        sp->stream.next_in = tif->tif_rawcp;
 
157
        sp->stream.avail_in = (uInt) tif->tif_rawcc;
 
158
        
156
159
        sp->stream.next_out = op;
157
160
        assert(sizeof(sp->stream.avail_out)==4);  /* if this assert gets raised,
158
161
            we need to simplify this code to reflect a ZLib that is likely updated
184
187
        } while (sp->stream.avail_out > 0);
185
188
        if (sp->stream.avail_out != 0) {
186
189
                TIFFErrorExt(tif->tif_clientdata, module,
187
 
                    "Not enough data at scanline %lu (short %llu bytes)",
188
 
                    (unsigned long) tif->tif_row, (unsigned long long) sp->stream.avail_out);
 
190
                    "Not enough data at scanline %lu (short " TIFF_UINT64_FORMAT " bytes)",
 
191
                    (unsigned long) tif->tif_row, (TIFF_UINT64_T) sp->stream.avail_out);
189
192
                return (0);
190
193
        }
 
194
 
 
195
        tif->tif_rawcp = sp->stream.next_in;
 
196
        tif->tif_rawcc = sp->stream.avail_in;
 
197
 
191
198
        return (1);
192
199
}
193
200
 
453
460
#endif /* ZIP_SUPORT */
454
461
 
455
462
/* vim: set ts=8 sts=8 sw=8 noet: */
 
463
/*
 
464
 * Local Variables:
 
465
 * mode: c
 
466
 * c-basic-offset: 8
 
467
 * fill-column: 78
 
468
 * End:
 
469
 */