Merge to M49: Reland "Fix sycc{420,422}_to_rgb issues."

core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include <limits>
 
-#include "codec_int.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 #include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 static const OPJ_OFF_T kSkipError = static_cast<OPJ_OFF_T>(-1);
 static const OPJ_SIZE_T kReadError = static_cast<OPJ_SIZE_T>(-1);
 static const OPJ_SIZE_T kWriteError = static_cast<OPJ_SIZE_T>(-1);
 
 static unsigned char stream_data[] = {
     0x00, 0x01, 0x02, 0x03,
     0x84, 0x85, 0x86, 0x87,  // Include some hi-bytes, too.
@@ skipping 469 matching lines @@
   y.prec = 8;
   y.bpp = 8;
   opj_image_t img;
   memset(&img, 0, sizeof(img));
   img.numcomps = 3;
   img.color_space = OPJ_CLRSPC_SYCC;
   img.comps = FX_Alloc(opj_image_comp_t, 3);
   const struct {
     OPJ_UINT32 w;
     bool expected;
-  } cases[] = {{0, false},
-               {1, false},
-               {30, false},
-               {31, true},
-               {32, true},
-               {33, true},
-               {34, false},
-               {UINT_MAX, false}};
+  } cases[] = {{0, false}, {1, false},  {30, false}, {31, true},
+               {32, true}, {33, false}, {34, false}, {UINT_MAX, false}};
   for (int i = 0; i < sizeof(cases) / sizeof(cases[0]); ++i) {
     y.w = cases[i].w;
     y.h = y.w;
     img.x1 = y.w;
     img.y1 = y.h;
     y.data = FX_Alloc(OPJ_INT32, y.w * y.h);
     memset(y.data, 1, y.w * y.h * sizeof(OPJ_INT32));
     u.data = FX_Alloc(OPJ_INT32, u.w * u.h);
     memset(u.data, 0, u.w * u.h * sizeof(OPJ_INT32));
     v.data = FX_Alloc(OPJ_INT32, v.w * v.h);
@@ skipping 12 matching lines @@
       EXPECT_NE(img.comps[0].h, img.comps[1].h);
       EXPECT_NE(img.comps[0].w, img.comps[2].w);
       EXPECT_NE(img.comps[0].h, img.comps[2].h);
     }
     FX_Free(img.comps[0].data);
     FX_Free(img.comps[1].data);
     FX_Free(img.comps[2].data);
   }
   FX_Free(img.comps);
 }