diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-10-12 16:57:03 -0700 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-10-12 16:57:03 -0700 |
| commit | 1f4c92d3957a7e57d3efcdde1fdb0f325b37815d (patch) | |
| tree | f46274a749757969c115015b9c2a4f93f38ed7b2 | |
| parent | 3e31be700028d5dc56dfad9a9b1e824042f34d91 (diff) | |
| download | pdfium-1f4c92d3957a7e57d3efcdde1fdb0f325b37815d.tar.xz | |
Merge to M47: Fix a compiling error on Mac
BUG=497357
TBR=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1395493003 .
(cherry picked from commit 3ea79bbba24a1c0918ea42368e746097dab40663)
Review URL: https://codereview.chromium.org/1404553002 .
| -rw-r--r-- | core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp index 2dabb5379d..8c4a5b2705 100644 --- a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp @@ -498,7 +498,7 @@ TEST(fxcodec, YUV420ToRGB) { img.color_space = OPJ_CLRSPC_SYCC; img.comps = FX_Alloc(opj_image_comp_t, 3); const struct { - int w; + OPJ_UINT32 w; bool expected; } cases[] = {{0, false}, {1, false}, |