~ubuntu-branches/ubuntu/trusty/blender/trusty-proposed

« back to all changes in this revision

Viewing changes to source/blender/imbuf/intern/tiff.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2013-08-14 10:43:49 UTC
  • mfrom: (14.2.19 sid)
  • Revision ID: package-import@ubuntu.com-20130814104349-t1d5mtwkphp12dyj
Tags: 2.68a-3
* Upload to unstable
* debian/: python3.3 Depends simplified
  - debian/control: python3.3 Depends dropped
    for blender-data package
  - 0001-blender_thumbnailer.patch refreshed
* debian/control: libavcodec b-dep versioning dropped

Show diffs side-by-side

added added

removed removed

Lines of Context:
532
532
        int level;
533
533
        short spp;
534
534
        int ib_depth;
 
535
        int found;
535
536
 
536
537
        /* check whether or not we have a TIFF file */
537
538
        if (size < IMB_TIFF_NCB) {
575
576
                if (spp == 4) {
576
577
                        unsigned short extra, *extraSampleTypes;
577
578
 
578
 
                        TIFFGetField(image, TIFFTAG_EXTRASAMPLES, &extra, &extraSampleTypes);
 
579
                        found = TIFFGetField(image, TIFFTAG_EXTRASAMPLES, &extra, &extraSampleTypes);
579
580
 
580
 
                        if (extraSampleTypes[0] == EXTRASAMPLE_ASSOCALPHA)
 
581
                        if (found && (extraSampleTypes[0] == EXTRASAMPLE_ASSOCALPHA)) {
581
582
                                ibuf->flags |= IB_alphamode_premul;
 
583
                        }
582
584
                }
583
585
        }
584
586