From 783b8917b920faa01320ae15d51fc4afac889737 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Wed, 17 Feb 2016 10:04:58 -0800 Subject: Merge to M48: lcms2: Fix a type confusion. TBR=tsepez@chromium.org BUG=584223 Original Review URL: https://codereview.chromium.org/1672163002 . (cherry picked from commit 5ef071fe48737c9e5d6165825404755ce2c877c9) Review URL: https://codereview.chromium.org/1706873003 . --- third_party/lcms2-2.6/0000-tag-type-confusion.patch | 14 ++++++++++++++ third_party/lcms2-2.6/README.pdfium | 13 +++++++++++++ third_party/lcms2-2.6/src/cmsio0.c | 3 ++- 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 third_party/lcms2-2.6/0000-tag-type-confusion.patch create mode 100644 third_party/lcms2-2.6/README.pdfium diff --git a/third_party/lcms2-2.6/0000-tag-type-confusion.patch b/third_party/lcms2-2.6/0000-tag-type-confusion.patch new file mode 100644 index 0000000000..df94cb7bfe --- /dev/null +++ b/third_party/lcms2-2.6/0000-tag-type-confusion.patch @@ -0,0 +1,14 @@ +diff --git a/third_party/lcms2-2.6/src/cmsio0.c b/third_party/lcms2-2.6/src/cmsio0.c +index 6549d15..5f9f08a 100644 +--- a/third_party/lcms2-2.6/src/cmsio0.c ++++ b/third_party/lcms2-2.6/src/cmsio0.c +@@ -719,7 +719,8 @@ cmsBool _cmsReadHeader(_cmsICCPROFILE* Icc) + for (j=0; j < Icc ->TagCount; j++) { + + if ((Icc ->TagOffsets[j] == Tag.offset) && +- (Icc ->TagSizes[j] == Tag.size)) { ++ (Icc ->TagSizes[j] == Tag.size) && ++ (Icc ->TagNames[j] == Tag.sig)) { + + Icc ->TagLinked[Icc ->TagCount] = Icc ->TagNames[j]; + } diff --git a/third_party/lcms2-2.6/README.pdfium b/third_party/lcms2-2.6/README.pdfium new file mode 100644 index 0000000000..19d2f68604 --- /dev/null +++ b/third_party/lcms2-2.6/README.pdfium @@ -0,0 +1,13 @@ +Name: Little CMS +URL: http://www.littlecms.com/ +Version: 2.6 +Security Critical: yes +License: MIT License + +Description: +Color Management Engine. + +Local Modifications: + +0000-tag-type-confusion.patch: Fix a type confusion. +TODO(ochang): List other patches. diff --git a/third_party/lcms2-2.6/src/cmsio0.c b/third_party/lcms2-2.6/src/cmsio0.c index 6549d15d9e..5f9f08a6f8 100644 --- a/third_party/lcms2-2.6/src/cmsio0.c +++ b/third_party/lcms2-2.6/src/cmsio0.c @@ -719,7 +719,8 @@ cmsBool _cmsReadHeader(_cmsICCPROFILE* Icc) for (j=0; j < Icc ->TagCount; j++) { if ((Icc ->TagOffsets[j] == Tag.offset) && - (Icc ->TagSizes[j] == Tag.size)) { + (Icc ->TagSizes[j] == Tag.size) && + (Icc ->TagNames[j] == Tag.sig)) { Icc ->TagLinked[Icc ->TagCount] = Icc ->TagNames[j]; } -- cgit v1.2.3