Fix warnings in android build, fix font rendering issue, fix issue 357588: wrong characters represe…

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 711 matching lines @@
                         } else {
                             *pPixel = (FX_BYTE)(src << -adjust_comps[channel]);
                         }
                     }
                 }
             } else {
                 for(row = 0; row < hei; row++) {
                     pScanline = pChannel + row * pitch;
                     for (col = 0; col < wid; col++) {
                         pPixel = pScanline + col * image->numcomps;
-                                                if (!image->comps[channel].data) continue;
+                        if (!image->comps[channel].data) {
+                            continue;
+                        }
                         src = image->comps[channel].data[row * wid + col];
                         src += image->comps[channel].sgnd ? 1 << (image->comps[channel].prec - 1) : 0;
                         if (adjust_comps[channel] - 1 < 0) {
                             *pPixel = (FX_BYTE)((src >> adjust_comps[channel]));
                         } else {
                             int tmpPixel = (src >> adjust_comps[channel]) + ((src >> (adjust_comps[channel] - 1)) % 2);
                             if (tmpPixel > 255) {
                                 tmpPixel = 255;
                             } else if (tmpPixel < 0) {
                                 tmpPixel = 0;
@@ skipping 47 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;
 }