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

core/src/fxge/dib/fx_dib_composite.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/fxge/fx_ge.h"
 #include "../../../include/fxcodec/fx_codec.h"
 #include "dib_int.h"
 const FX_BYTE g_GammaRamp[256] = {
@@ skipping 3787 matching lines @@
                      + (src_format & 0x0400 ? 16 : 0)
                      + (dest_format & 0x0400 ? 32 : 0)
                      + (pIccTransform ? 64 : 0);
     return TRUE;
 }
 void CFX_ScanlineCompositor::CompositeRgbBitmapLine(FX_LPBYTE dest_scan, FX_LPCBYTE src_scan, int width, FX_LPCBYTE clip_scan,
         FX_LPCBYTE src_extra_alpha, FX_LPBYTE dst_extra_alpha)
 {
     int src_Bpp = (m_SrcFormat & 0xff) >> 3;
     int dest_Bpp = (m_DestFormat & 0xff) >> 3;
-    int dest_Size = width * dest_Bpp + 4;
     if (m_bRgbByteOrder) {
         switch (m_Transparency) {
             case 0:
             case 4:
             case 8:
             case 12:
                 _CompositeRow_Argb2Argb_RgbByteOrder(dest_scan, src_scan, width, m_BlendType, clip_scan);
                 break;
             case 1:
                 _CompositeRow_Rgb2Argb_Blend_NoClip_RgbByteOrder(dest_scan, src_scan, width, m_BlendType, src_Bpp);
@@ skipping 60 matching lines @@
                 _CompositeRow_Rgb2Gray(dest_scan, src_scan, src_Bpp, width, m_BlendType, clip_scan, m_pIccTransform);
             }
         }
         if (m_DestFormat & 0x0400) {
             for (int i = 0; i < width; i ++) {
                 *dest_scan = ~*dest_scan;
                 dest_scan++;
             }
         }
     } else {
+        int dest_Size = width * dest_Bpp + 4;
         if (dest_Size > m_CacheSize) {
             m_pCacheScanline = FX_Realloc(FX_BYTE, m_pCacheScanline, dest_Size);
             if (!m_pCacheScanline) {
                 return;
             }
             m_CacheSize = dest_Size;
         }
         switch (m_Transparency) {
             case 0:
             case 4:
@@ skipping 694 matching lines @@
     }
     src_alpha_scan = m_pScanlineAlphaV;
     dest_alpha_scan = dest_alpha_buf;
     if (dest_alpha_scan) {
         for (i = 0; i < m_DestHeight; i ++) {
             *dest_alpha_scan = *src_alpha_scan++;
             dest_alpha_scan += y_alpha_step;
         }
     }
 }