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

core/src/fpdftext/fpdf_text_int.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/fpdfapi/fpdf_resource.h"
 #include "../../include/fpdfapi/fpdf_pageobj.h"
 #include "../../include/fpdftext/fpdf_text.h"
 #include "../../include/fpdfapi/fpdf_page.h"
@@ skipping 921 matching lines @@
 {
     if (!m_pPage)       {
         return -1;
     }
     const FX_INT32 nPageWidth = (FX_INT32)((CPDF_Page*)m_pPage)->GetPageWidth();
     const FX_INT32 nPageHeight = (FX_INT32)((CPDF_Page*)m_pPage)->GetPageHeight();
     CFX_ByteArray nHorizontalMask;
     if (!nHorizontalMask.SetSize(nPageWidth)) {
         return -1;
     }
-        FX_BYTE* pDataH = nHorizontalMask.GetData();
+    FX_BYTE* pDataH = nHorizontalMask.GetData();
     CFX_ByteArray nVerticalMask;
     if (!nVerticalMask.SetSize(nPageHeight)) {
         return -1;
     }
-        FX_BYTE* pDataV = nVerticalMask.GetData();
+    FX_BYTE* pDataV = nVerticalMask.GetData();
     FX_INT32 index = 0;
     FX_FLOAT fLineHeight = 0.0f;
     CPDF_PageObject* pPageObj = NULL;
     FX_POSITION pos = NULL;
     pos = m_pPage->GetFirstObjectPosition();
     if(!pos) {
         return -1;
     }
     while(pos) {
         pPageObj = m_pPage->GetNextObject(pos);
         if(NULL == pPageObj) {
             continue;
         }
         if(PDFPAGE_TEXT != pPageObj->m_Type) {
             continue;
         }
-                FX_INT32 minH = (FX_INT32)pPageObj->m_Left < 0 ? 0 : (FX_INT32)pPageObj->m_Left;
-                FX_INT32 maxH = (FX_INT32)pPageObj->m_Right > nPageWidth ? nPageWidth : (FX_INT32)pPageObj->m_Right;
-                FX_INT32 minV = (FX_INT32)pPageObj->m_Bottom < 0 ? 0 : (FX_INT32)pPageObj->m_Bottom;
-                FX_INT32 maxV = (FX_INT32)pPageObj->m_Top > nPageHeight ? nPageHeight : (FX_INT32)pPageObj->m_Top;
-                if (minH >= maxH || minV >= maxV){
-                        continue;
-                }
-
-                FXSYS_memset8(pDataH + minH, 1, maxH - minH);
-                FXSYS_memset8(pDataV + minV, 1, maxV - minV);
-
-                if (fLineHeight <= 0.0f) {
-                        fLineHeight = pPageObj->m_Top - pPageObj->m_Bottom;
-                }
-
-                pPageObj = NULL;
+        FX_INT32 minH = (FX_INT32)pPageObj->m_Left < 0 ? 0 : (FX_INT32)pPageObj->m_Left;
+        FX_INT32 maxH = (FX_INT32)pPageObj->m_Right > nPageWidth ? nPageWidth : (FX_INT32)pPageObj->m_Right;
+        FX_INT32 minV = (FX_INT32)pPageObj->m_Bottom < 0 ? 0 : (FX_INT32)pPageObj->m_Bottom;
+        FX_INT32 maxV = (FX_INT32)pPageObj->m_Top > nPageHeight ? nPageHeight : (FX_INT32)pPageObj->m_Top;
+        if (minH >= maxH || minV >= maxV) {
+            continue;
+        }
+        FXSYS_memset8(pDataH + minH, 1, maxH - minH);
+        FXSYS_memset8(pDataV + minV, 1, maxV - minV);
+        if (fLineHeight <= 0.0f) {
+            fLineHeight = pPageObj->m_Top - pPageObj->m_Bottom;
+        }
+        pPageObj = NULL;
     }
     FX_INT32 nStartH = 0;
     FX_INT32 nEndH = 0;
     FX_FLOAT nSumH = 0.0f;
     for (index = 0; index < nPageWidth; index++)
         if(1 == nHorizontalMask[index]) {
             break;
         }
     nStartH = index;
     for (index = nPageWidth; index > 0; index--)
@@ skipping 1805 matching lines @@
     if (!m_IsParserd || index < 0 || index >= m_LinkList.GetSize()) {
         return;
     }
     CPDF_LinkExt* link = NULL;
     link = m_LinkList.GetAt(index);
     if (!link) {
         return ;
     }
     m_pTextPage->GetRectArray(link->m_Start, link->m_Count, rects);
 }