diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-08-14 10:36:01 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-08-14 15:02:17 +0000 |
| commit | 0bd847232a1f430c70dd9d8df177ce68a3cde010 (patch) | |
| tree | 15cec8c11493549f1974ae2f6aeac58234c176d2 /third_party/lcms/0006-tag-type-confusion.patch | |
| parent | dff02cee2d2410d81a55c59345fb38b5aac8a457 (diff) | |
| download | pdfium-0bd847232a1f430c70dd9d8df177ce68a3cde010.tar.xz | |
LCMS: upgrade to 2.8
This CL upgrades LCMS from version 2.6 to 2.8. All changes from LCMS
original version 2.8 are stored in patch files:
- Patch 0: memory management modifications to use PDFium methods. This
was previously not in any patch, so the changes were manually applied.
- Patches 1-5: new patch files corresponding to old changes that can be
seen in the history, but did not previously have patch files.
- Patches 6-25: previous patches (patch numbers shifted by 6). The one
for from16-to-8-overflow.patch was deleted as it was already upstream.
Some patches did not apply cleanly so their .patch files were modified.
- Patch 26: as I just moved files directly, unsupported characters were
moved in unchanged, so I had to fix all of them: e with tilde and
other characters were replaced to allow compilation on Windows.
- Patch 27: Went over the code and re-applied changes that included
comments clearly indicating this was Foxit. These changes are all
already seen in the initial PDFium commit.
Change-Id: Ic1d84e54803ef9e6b280ef7619bbf0b757312fbf
Reviewed-on: https://pdfium-review.googlesource.com/10590
Commit-Queue: Nicolás Peña <npm@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/lcms/0006-tag-type-confusion.patch')
| -rw-r--r-- | third_party/lcms/0006-tag-type-confusion.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/third_party/lcms/0006-tag-type-confusion.patch b/third_party/lcms/0006-tag-type-confusion.patch new file mode 100644 index 0000000000..97d3c7f4d9 --- /dev/null +++ b/third_party/lcms/0006-tag-type-confusion.patch @@ -0,0 +1,14 @@ +diff --git a/third_party/lcms/src/cmsio0.c b/third_party/lcms/src/cmsio0.c +index 6549d15..5f9f08a 100644 +--- a/third_party/lcms/src/cmsio0.c ++++ b/third_party/lcms/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]; + } |