summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJun Fang <jun_fang@foxitsoftware.com>2015-10-09 13:40:38 +0800
committerJun Fang <jun_fang@foxitsoftware.com>2015-10-09 13:59:17 +0800
commit79c38e39d5094b03bfddd80dd39a666a96bbcdcc (patch)
tree7d2cbee2f420c6df885f834fe0d8b1d67de9e90c /core
parent14ce18c7c4ffe06ec743dbbb8bc523bb223cef5d (diff)
downloadpdfium-79c38e39d5094b03bfddd80dd39a666a96bbcdcc.tar.xz
Merge to XFA: Fix a compiling error on Mac
BUG=497357 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1395493003 .
Diffstat (limited to 'core')
-rw-r--r--core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp2
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 6dfb17cd62..1245cf6e23 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},