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-memory-leak-Type_NamedColor_Read.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-memory-leak-Type_NamedColor_Read.patch')
-rw-r--r-- | third_party/lcms/0006-memory-leak-Type_NamedColor_Read.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/third_party/lcms/0006-memory-leak-Type_NamedColor_Read.patch b/third_party/lcms/0006-memory-leak-Type_NamedColor_Read.patch deleted file mode 100644 index f6fa010357..0000000000 --- a/third_party/lcms/0006-memory-leak-Type_NamedColor_Read.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/third_party/lcms/src/cmstypes.c b/third_party/lcms/src/cmstypes.c -index feba387..4d24fc2 100644 ---- a/third_party/lcms/src/cmstypes.c -+++ b/third_party/lcms/src/cmstypes.c -@@ -3102,7 +3102,7 @@ void *Type_NamedColor_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* i - - if (nDeviceCoords > cmsMAXCHANNELS) { - cmsSignalError(self->ContextID, cmsERROR_RANGE, "Too many device coordinates '%d'", nDeviceCoords); -- return 0; -+ goto Error; - } - for (i=0; i < count; i++) { - -@@ -3111,7 +3111,7 @@ void *Type_NamedColor_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* i - char Root[33]; - - memset(Colorant, 0, sizeof(Colorant)); -- if (io -> Read(io, Root, 32, 1) != 1) return NULL; -+ if (io -> Read(io, Root, 32, 1) != 1) goto Error; - Root[32] = 0; - if (!_cmsReadUInt16Array(io, 3, PCS)) goto Error; - if (!_cmsReadUInt16Array(io, nDeviceCoords, Colorant)) goto Error; |