From f312794507ee72641884e54c674910acdb04ca7e Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Wed, 14 Oct 2015 19:51:25 -0700 Subject: Merge to M46: 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/1405903002 . --- core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}, -- cgit v1.2.3