diff options
| author | tpayne@chromium.org <tpayne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 19:54:04 +0000 |
|---|---|---|
| committer | tpayne@chromium.org <tpayne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-24 19:54:04 +0000 |
| commit | a435560cfe442b7e735cb65cd2afdc22343c0797 (patch) | |
| tree | 62dfad1f21d4192907290748e16c9baf3276ac5d | |
| parent | 26d4b33d8fdc338d1677c94e97200bcbd62ee616 (diff) | |
| download | chromium_src-a435560cfe442b7e735cb65cd2afdc22343c0797.zip chromium_src-a435560cfe442b7e735cb65cd2afdc22343c0797.tar.gz chromium_src-a435560cfe442b7e735cb65cd2afdc22343c0797.tar.bz2 | |
Applied upstream patch for image with profiles that contain a LUT
BUG=129452
TEST=None
Review URL: https://chromiumcodereview.appspot.com/10439002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138870 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | third_party/qcms/README.chromium | 2 | ||||
| -rw-r--r-- | third_party/qcms/src/transform.c | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/third_party/qcms/README.chromium b/third_party/qcms/README.chromium index 8f87f06..7043ed0 100644 --- a/third_party/qcms/README.chromium +++ b/third_party/qcms/README.chromium @@ -19,3 +19,5 @@ google.patch - Add bgra output support. Apply with patch -p1 < google.patch - Use HAVE_POSIX_MEMALIGN instead of HAS_POSIX_MEMALIG (https://bugzilla.mozilla.org/show_bug.cgi?id=692922) +Applied upstream patch: + - https://bug752254.bugzilla.mozilla.org/attachment.cgi?id=626102 diff --git a/third_party/qcms/src/transform.c b/third_party/qcms/src/transform.c index 527c035..1f4e72b 100644 --- a/third_party/qcms/src/transform.c +++ b/third_party/qcms/src/transform.c @@ -1059,13 +1059,15 @@ void qcms_profile_precache_output_transform(qcms_profile *profile) if (profile->color_space != RGB_SIGNATURE) return; - /* don't precache since we will use the B2A LUT */ - if (profile->B2A0) - return; - - /* don't precache since we will use the mBA LUT */ - if (profile->mBA) - return; + if (qcms_supports_iccv4) { + /* don't precache since we will use the B2A LUT */ + if (profile->B2A0) + return; + + /* don't precache since we will use the mBA LUT */ + if (profile->mBA) + return; + } /* don't precache if we do not have the TRC curves */ if (!profile->redTRC || !profile->greenTRC || !profile->blueTRC) |