More fixes in sycc422_to_rgb and sycc420_to_rgb when image width is odd

core/src/fxcodec/codec/fx_codec_jpx_opj.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.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fxcodec/fx_codec.h"
 #include "codec_int.h"
 #include "../fx_libopenjpeg/libopenjpeg20/openjpeg.h"
 #include "../lcms2/include/fx_lcms2.h"
@@ skipping 148 matching lines @@
     upb = (1 << i) - 1;
     maxw = (int)img->comps[0].w;
     maxh = (int)img->comps[0].h;
     max = maxw * maxh;
     y = img->comps[0].data;
     cb = img->comps[1].data;
     cr = img->comps[2].data;
     d0 = r = FX_Alloc(int, (size_t)max);
     d1 = g = FX_Alloc(int, (size_t)max);
     d2 = b = FX_Alloc(int, (size_t)max);
-    for(i = 0; i < maxh; ++i) {
-        for (j = 0; j < maxw; ++j, ++y, ++r, ++g, ++b) {
+    for(i = 0; i < maxh; ++i)
+    {
+        for (j = 0; (OPJ_UINT32)j < (maxw & ~(OPJ_UINT32)1); j += 2)
+        {
             sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-            if (j % 2){
-                ++cb;
-                ++cr;
-            }
+            ++y; ++r; ++g; ++b;
+            sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+            ++y; ++r; ++g; ++b; ++cb; ++cr;
+        }
+        if (j < maxw)
+        {
+            sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+            ++y; ++r; ++g; ++b; ++cb; ++cr;
         }
     }
     FX_Free(img->comps[0].data);
     img->comps[0].data = d0;
     FX_Free(img->comps[1].data);
     img->comps[1].data = d1;
     FX_Free(img->comps[2].data);
     img->comps[2].data = d2;
     img->comps[1].w = maxw;
     img->comps[1].h = maxh;
@@ skipping 19 matching lines @@
     upb = (1 << i) - 1;
     maxw = (int)img->comps[0].w;
     maxh = (int)img->comps[0].h;
     max = maxw * maxh;
     y = img->comps[0].data;
     cb = img->comps[1].data;
     cr = img->comps[2].data;
     d0 = r = FX_Alloc(int, (size_t)max);
     d1 = g = FX_Alloc(int, (size_t)max);
     d2 = b = FX_Alloc(int, (size_t)max);
-    for(i = 0; i < maxh; i += 2) {
+    for (i = 0; (OPJ_UINT32)i < (maxh & ~(OPJ_UINT32)1); i += 2)
+    {
         ny = y + maxw;
         nr = r + maxw;
         ng = g + maxw;
         nb = b + maxw;
-        for(j = 0; j < maxw;  j += 2) {
+        for (j = 0; (OPJ_UINT32)j < (maxw & ~(OPJ_UINT32)1); j += 2)
+        {
             sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-            ++y;
-            ++r;
-            ++g;
-            ++b;
+            ++y; ++r; ++g; ++b;
             sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
-            ++y;
-            ++r;
-            ++g;
-            ++b;
+            ++y; ++r; ++g; ++b;
             sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
-            ++ny;
-            ++nr;
-            ++ng;
-            ++nb;
+            ++ny; ++nr; ++ng; ++nb;
             sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
-            ++ny;
-            ++nr;
-            ++ng;
-            ++nb;
-            ++cb;
-            ++cr;
+            ++ny; ++nr; ++ng; ++nb; ++cb; ++cr;
         }
-        y += maxw;
-        r += maxw;
-        g += maxw;
-        b += maxw;
+        if (j < maxw)
+        {
+            sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+            ++y; ++r; ++g; ++b;
+            sycc_to_rgb(offset, upb, *ny, *cb, *cr, nr, ng, nb);
+            ++ny; ++nr; ++ng; ++nb; ++cb; ++cr;
+        }
+        y += maxw; r += maxw; g += maxw; b += maxw;
     }
+    if (i < maxh)
+    {
+        for (j = 0; (OPJ_UINT32)j < (maxw & ~(OPJ_UINT32)1); j += 2)
+        {
+            sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+            ++y; ++r; ++g; ++b;
+            sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+            ++y; ++r; ++g; ++b; ++cb; ++cr;
+        }
+        if (j < maxw)
+        {
+            sycc_to_rgb(offset, upb, *y, *cb, *cr, r, g, b);
+        }
+    }
+
     FX_Free(img->comps[0].data);
     img->comps[0].data = d0;
     FX_Free(img->comps[1].data);
     img->comps[1].data = d1;
     FX_Free(img->comps[2].data);
     img->comps[2].data = d2;
     img->comps[1].w = maxw;
     img->comps[1].h = maxh;
     img->comps[2].w = maxw;
     img->comps[2].h = maxh;
@@ skipping 513 matching lines @@
 FX_BOOL CCodec_JpxModule::Decode(void* ctx, FX_LPBYTE dest_data, int pitch, FX_BOOL bTranslateColor, FX_LPBYTE offsets)
 {
     CJPX_Decoder* pDecoder = (CJPX_Decoder*)ctx;
     return pDecoder->Decode(dest_data, pitch, bTranslateColor, offsets);
 }
 void CCodec_JpxModule::DestroyDecoder(void* ctx)
 {
     CJPX_Decoder* pDecoder = (CJPX_Decoder*)ctx;
     delete pDecoder;
 }