← Back to branch summary

~vorlon/ubuntu/oneiric/lcms/multiarch

« back to all changes in this revision

Viewing changes to src/cmsxform.c

  • Committer: Bazaar Package Importer
  • Author(s): Oleksandr Moskalenko
  • Date: 2011-07-18 17:26:55 UTC
  • mfrom: (1.1.6 upstream) (12.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110718172655-cql1riyv12d96rhp
Tags: 1.19.dfsg-1
http://bugs.debian.org/593314
http://bugs.debian.org/608007
http://bugs.debian.org/634136
* Upstream legacy update to 1.19 (Closes: #593314).
* debian/rules:
  - Updated the binary package descriptions (Closes: #608007).
  - Switched rules from py_support to py_support2.
  - Removed patching rules.
* debian/control:
  - Change build-depends on libjpeg62-dev to libjpeg-dev (Closes: #634136).
  - Removed deprecated python-support package from build depends.;
  - Updated standards version to 3.9.2.
  - Removed a depends on dpatch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cmsxform.c
658
658
                LPGAMMATABLE Shapes1[3];
659
659
 
660
660
                GrayTRC = cmsReadICCGamma(hProfile, icSigGrayTRCTag);
 
661
                if (GrayTRC == NULL) return NULL;
661
662
                FromLstarToXYZ(GrayTRC, Shapes1);
662
663
 
663
 
                if (GrayTRC == NULL)
664
 
                        return NULL;
 
664
        
665
665
 
666
666
                // Reversing must be done after curve translation
667
667
 
677
677
                // Normal case
678
678
 
679
679
                GrayTRC = cmsReadICCGammaReversed(hProfile, icSigGrayTRCTag);   // Y
680
 
 
681
 
                if (GrayTRC == NULL)
682
 
                        return NULL;
 
680
                if (GrayTRC == NULL) return NULL;
683
681
 
684
682
                Shapes[0] = cmsDupGamma(GrayTRC);
685
683
                Shapes[1] = cmsDupGamma(GrayTRC);
1877
1875
        lIsInput      = (CurrentColorSpace != icSigXYZData) &&
1878
1876
                        (CurrentColorSpace != icSigLabData);
1879
1877
 
1880
 
        if (lIsInput) {
 
1878
        if (lIsInput || lIsDeviceLink) {
1881
1879
 
1882
1880
            ColorSpaceIn    = cmsGetColorSpace(hProfile);
1883
1881
            ColorSpaceOut   = cmsGetPCS(hProfile);