From 79c38e39d5094b03bfddd80dd39a666a96bbcdcc Mon Sep 17 00:00:00 2001
From: Jun Fang <jun_fang@foxitsoftware.com>
Date: Fri, 9 Oct 2015 13:40:38 +0800
Subject: Merge to XFA: Fix a compiling error on Mac

BUG=497357

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1395493003 .
---
 core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core')

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},
-- 
cgit v1.2.3