← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to plugins/colorengines/lcms/colorprofiles/LcmsColorProfileContainer.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/colorengines/lcms/colorprofiles/LcmsColorProfileContainer.cpp
170
170
        d->info = d->productInfo;
171
171
 
172
172
        // Check if the profile can convert (something->this)
173
 
#if 0
174
 
//         LPMATSHAPER OutMatShaper = cmsBuildOutputMatrixShaper(d->profile);
175
 
//         if( OutMatShaper )
176
 
//         {
177
 
//             d->suitableForOutput = true;
178
 
//         }
179
 
#endif
180
 
#if 0
181
 
        cmsCIEXYZTRIPLE Primaries;
182
 
 
183
 
        if (cmsTakeColorants(&Primaries, d->profile)) {
 
173
        LPMATSHAPER OutMatShaper = cmsBuildOutputMatrixShaper(d->profile);
 
174
        if( OutMatShaper )
 
175
        {
184
176
            d->suitableForOutput = true;
185
 
        }
186
 
#endif
187
 
        if (cmsIsTag(d->profile, icSigAToB0Tag)  &&
188
 
                cmsIsTag(d->profile, icSigAToB1Tag) &&
189
 
                cmsIsTag(d->profile, icSigAToB2Tag) &&
190
 
                cmsIsTag(d->profile, icSigBToA0Tag) &&
191
 
                cmsIsTag(d->profile, icSigBToA1Tag)  &&
192
 
                cmsIsTag(d->profile, icSigBToA2Tag)) {
 
177
            cmsFreeMatShaper(OutMatShaper);
 
178
        } else if (cmsIsTag(d->profile, icSigAToB0Tag)  &&
 
179
                   cmsIsTag(d->profile, icSigBToA0Tag) ) {
193
180
            d->suitableForOutput = true;
194
181
        } else {
195
182
            d->suitableForOutput = false;