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

core/src/fxge/dib/fx_dib_convert.cpp

Index: core/src/fxge/dib/fx_dib_convert.cpp
diff --git a/core/src/fxge/dib/fx_dib_convert.cpp b/core/src/fxge/dib/fx_dib_convert.cpp
index 0120721e3582657f81670d337409d25bfe0f3954..2a744526261a99bfd7d70d192ba0a6e5a2a0cf74 100644
--- a/core/src/fxge/dib/fx_dib_convert.cpp
+++ b/core/src/fxge/dib/fx_dib_convert.cpp
@@ -452,7 +452,7 @@ FX_BOOL _ConvertBuffer_RgbOrCmyk2Gray(FX_LPBYTE dest_buf, int dest_pitch, int wi
                     src_scan += 4;
                 }
             }
-        } else
+        } else {
             for (int row = 0; row < height; row ++) {
                 FX_LPBYTE dest_scan = dest_buf + row * dest_pitch;
                 FX_LPCBYTE src_scan = pSrcBitmap->GetScanline(src_top + row) + src_left * Bpp;
@@ -461,6 +461,7 @@ FX_BOOL _ConvertBuffer_RgbOrCmyk2Gray(FX_LPBYTE dest_buf, int dest_pitch, int wi
                     src_scan += Bpp;
                 }
             }
+        }
     }
     return TRUE;
 }