Chromium Code Reviews
Help | Chromium Project | Gerrit Changes | Sign in
(27)

Issue 1416783002: Merge to M46: upgrade openjpeg to commit# cf352af (Closed)

Created:
4 years, 1 month ago by Lei Zhang
Modified:
4 years, 1 month ago
Reviewers:
Tom Sepez
CC:
pdfium-reviews_googlegroups.com
Base URL:
https://pdfium.googlesource.com/pdfium.git@2490
Target Ref:
refs/heads/chromium/2490
Visibility:
Public.

Description

Merge to M46: upgrade openjpeg to commit# cf352af BUG=457480, 497355 R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1338973005 . (cherry picked from commit c212b684cb028a5d98e57f711c9eed931b853a44) Committed: https://pdfium.googlesource.com/pdfium/+/0300abca7af7ad627ad9b59bdb88c2fec0505b12

Patch Set 1 #

Patch Set 2 : Fix pdfium:168 since we are already half way there #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1909 lines, -1198 lines) Patch
M core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp View 1 1 chunk +1 line, -1 line 0 comments Download
M core/src/fxcodec/codec/fx_codec_jpx_opj.cpp View 1 4 chunks +7 lines, -6 lines 0 comments Download
A third_party/libopenjpeg20/0000-use-colorspace.patch View 1 chunk +27 lines, -0 lines 0 comments Download
A third_party/libopenjpeg20/0001-image-data.patch View 1 chunk +26 lines, -0 lines 0 comments Download
A third_party/libopenjpeg20/0002-packet-iterator.patch View 1 chunk +27 lines, -0 lines 0 comments Download
A third_party/libopenjpeg20/0003-dwt-decode.patch View 1 chunk +191 lines, -0 lines 0 comments Download
A third_party/libopenjpeg20/README.pdfium View 1 chunk +16 lines, -0 lines 0 comments Download
M third_party/libopenjpeg20/bio.c View 4 chunks +4 lines, -4 lines 0 comments Download
M third_party/libopenjpeg20/cio.h View 10 chunks +10 lines, -10 lines 0 comments Download
M third_party/libopenjpeg20/cio.c View 4 chunks +4 lines, -4 lines 0 comments Download
M third_party/libopenjpeg20/dwt.h View 1 chunk +2 lines, -2 lines 0 comments Download
M third_party/libopenjpeg20/dwt.c View 19 chunks +28 lines, -28 lines 0 comments Download
M third_party/libopenjpeg20/event.h View 1 chunk +6 lines, -0 lines 0 comments Download
M third_party/libopenjpeg20/function_list.h View 1 chunk +1 line, -1 line 0 comments Download
M third_party/libopenjpeg20/function_list.c View 2 chunks +5 lines, -4 lines 0 comments Download
M third_party/libopenjpeg20/image.c View 3 chunks +20 lines, -16 lines 0 comments Download
M third_party/libopenjpeg20/indexbox_manager.h View 1 chunk +1 line, -1 line 0 comments Download
M third_party/libopenjpeg20/invert.c View 4 chunks +4 lines, -4 lines 0 comments Download
M third_party/libopenjpeg20/j2k.h View 5 chunks +22 lines, -3 lines 0 comments Download
M third_party/libopenjpeg20/j2k.c View 143 chunks +934 lines, -741 lines 0 comments Download
M third_party/libopenjpeg20/jp2.h View 2 chunks +1 line, -14 lines 0 comments Download
M third_party/libopenjpeg20/jp2.c View 50 chunks +286 lines, -128 lines 0 comments Download
M third_party/libopenjpeg20/mct.c View 2 chunks +2 lines, -2 lines 0 comments Download
M third_party/libopenjpeg20/mqc.c View 5 chunks +5 lines, -5 lines 0 comments Download
M third_party/libopenjpeg20/openjpeg.h View 4 chunks +6 lines, -3 lines 0 comments Download
M third_party/libopenjpeg20/openjpeg.c View 3 chunks +4 lines, -6 lines 0 comments Download
M third_party/libopenjpeg20/opj_includes.h View 1 chunk +39 lines, -7 lines 0 comments Download
M third_party/libopenjpeg20/opj_intmath.h View 4 chunks +27 lines, -2 lines 0 comments Download
M third_party/libopenjpeg20/opj_malloc.h View 1 chunk +1 line, -1 line 0 comments Download
M third_party/libopenjpeg20/pi.h View 1 chunk +1 line, -1 line 0 comments Download
M third_party/libopenjpeg20/pi.c View 16 chunks +16 lines, -16 lines 0 comments Download
M third_party/libopenjpeg20/t1.c View 38 chunks +60 lines, -70 lines 0 comments Download
M third_party/libopenjpeg20/t2.h View 1 chunk +2 lines, -1 line 0 comments Download
M third_party/libopenjpeg20/t2.c View 29 chunks +53 lines, -45 lines 0 comments Download
M third_party/libopenjpeg20/tcd.h View 4 chunks +8 lines, -4 lines 0 comments Download
M third_party/libopenjpeg20/tcd.c View 34 chunks +53 lines, -60 lines 0 comments Download
M third_party/libopenjpeg20/tgt.h View 2 chunks +3 lines, -2 lines 0 comments Download
M third_party/libopenjpeg20/tgt.c View 5 chunks +6 lines, -6 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
Lei Zhang
PTAL. third_party/libopenjpeg20/jp2.c and third_party/libopenjpeg20/openjpeg.h conflicted, so I preferred theirs over ours. Thus this also adds ...
4 years, 1 month ago (2015-10-19 22:38:07 UTC) #1
Tom Sepez
lgtm
4 years, 1 month ago (2015-10-19 23:01:13 UTC) #2
Lei Zhang
4 years, 1 month ago (2015-10-19 23:14:50 UTC) #3
Message was sent while issue was closed.
Committed patchset #2 (id:20001) manually as
0300abca7af7ad627ad9b59bdb88c2fec0505b12 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698