← Back to branch summary

~ubuntu-branches/debian/stretch/libgdiplus/stretch

« back to all changes in this revision

Viewing changes to src/tiffcodec.c

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-10-10 11:31:26 UTC
  • mfrom: (1.1.23)
  • Revision ID: package-import@ubuntu.com-20131010113126-ecj1t0t211tikifi
Tags: 2.11+git20131008.9732566-1
http://bugs.debian.org/649946
http://bugs.debian.org/662402
* [285d0a3] Imported Upstream version 2.11+git20131008.9732566 
  (Closes: #649946)
* [b7b1355] Build-depends on libtiff5-dev | libtiff-dev, change 
  from libtiff4-dev (Closes #681132)
* [fea5c93] Build-Depends on libpng-dev, change from libpng12-dev 
  (Closes: #662402)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tiffcodec.c
219
219
        uint32  rows_per_strip;
220
220
        uint32  tile_length;
221
221
        uint32  tile_width;
 
222
        uint16 compression = 0;
222
223
 
223
224
        samples_per_pixel = 0;
224
225
        bits_per_sample = 0;
269
270
        }
270
271
 
271
272
        if (TIFFGetField(tiff, TIFFTAG_COMPRESSION, &s)) {
 
273
                compression = s;
272
274
                gdip_bitmapdata_property_add_short(bitmap_data, PropertyTagCompression, s);
273
275
        }
274
276
 
393
395
                gdip_bitmapdata_property_add_short(bitmap_data, PropertyTagPlanarConfig, planar_configuration);
394
396
        }
395
397
 
396
 
        if (TIFFGetField(tiff, TIFFTAG_PREDICTOR, &s)) {
397
 
                gdip_bitmapdata_property_add_short(bitmap_data, PropertyTagPredictor, s);
 
398
        if (compression == COMPRESSION_ADOBE_DEFLATE) {
 
399
                if (TIFFGetField(tiff, TIFFTAG_PREDICTOR, &s)) {
 
400
                        gdip_bitmapdata_property_add_short(bitmap_data, PropertyTagPredictor, s);
 
401
                }
398
402
        }
399
403
 
400
404
        {