Cleanup IFX_BidiChar

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 <ctype.h>
 #include <algorithm>
 
 #include "../../../third_party/base/nonstd_unique_ptr.h"
@@ skipping 1125 matching lines @@
             FX_RECT BBox;
             pFont->GetCharBBox(charCode, BBox);
             w = BBox.right - BBox.left;
         }
     }
     return w;
 }
 void CPDF_TextPage::OnPiece(IFX_BidiChar* pBidi, CFX_WideString& str)
 {
     int32_t start, count;
-    int32_t ret = pBidi->GetBidiInfo(start, count);
-    if(ret == 2) {
+    IFX_BidiChar::Direction ret = pBidi->GetBidiInfo(&start, &count);
+    if (ret == IFX_BidiChar::RIGHT) {
         for(int i = start + count - 1; i >= start; i--) {
             m_TextBuf.AppendChar(str.GetAt(i));
             m_charList.Add(*(PAGECHAR_INFO*)m_TempCharList.GetAt(i));
         }
     } else {
         int end = start + count ;
         for(int i = start; i < end; i++) {
             m_TextBuf.AppendChar(str.GetAt(i));
             m_charList.Add(*(PAGECHAR_INFO*)m_TempCharList.GetAt(i));
         }
@@ skipping 86 matching lines @@
                 str.Delete(i);
                 count1--;
                 i--;
                 continue;
             }
             bPrevSpace = TRUE;
         } else {
             bPrevSpace = FALSE;
         }
         if(pBidiChar->AppendChar(str.GetAt(i))) {
-            int32_t ret = pBidiChar->GetBidiInfo(start, count);
+            IFX_BidiChar::Direction ret =
+                pBidiChar->GetBidiInfo(&start, &count);
             order.Add(start);
             order.Add(count);
             order.Add(ret);
             if(!bR2L) {
-                if(ret == 2) {
+                if (ret == IFX_BidiChar::RIGHT) {
                     nR2L++;
-                } else if (ret == 1) {
+                } else if (ret == IFX_BidiChar::LEFT) {
                     nL2R++;
                 }
             }
         }
     }
     if(pBidiChar->EndChar()) {
-        int32_t ret = pBidiChar->GetBidiInfo(start, count);
+        IFX_BidiChar::Direction ret = pBidiChar->GetBidiInfo(&start, &count);
         order.Add(start);
         order.Add(count);
         order.Add(ret);
         if(!bR2L) {
-            if(ret == 2) {
+            if (ret == IFX_BidiChar::RIGHT) {
                 nR2L++;
-            } else if(ret == 1) {
+            } else if (ret == IFX_BidiChar::LEFT) {
                 nL2R++;
             }
         }
     }
     if(nR2L > 0 && nR2L >= nL2R) {
         bR2L = TRUE;
     }
     if (m_parserflag == FPDFTEXT_RLTB || bR2L) {
         int count = order.GetSize();
         for(int i = count - 1; i > 0; i -= 3) {
@@ skipping 564 matching lines @@
         std::swap(pTempBuffer[i], pTempBuffer[j]);
     }
 }
 FX_BOOL CPDF_TextPage::IsRightToLeft(const CPDF_TextObject* pTextObj,
                                      const CPDF_Font* pFont,
                                      int nItems) const
 {
     nonstd::unique_ptr<IFX_BidiChar> pBidiChar(IFX_BidiChar::Create());
     int32_t nR2L = 0;
     int32_t nL2R = 0;
-    int32_t start = 0, count = 0;
     CPDF_TextObjectItem item;
     for (int32_t i = 0; i < nItems; i++) {
         pTextObj->GetItemInfo(i, &item);
         if (item.m_CharCode == (FX_DWORD)-1) {
             continue;
         }
         CFX_WideString wstrItem = pFont->UnicodeFromCharCode(item.m_CharCode);
         FX_WCHAR wChar = wstrItem.GetAt(0);
         if ((wstrItem.IsEmpty() || wChar == 0) && item.m_CharCode) {
             wChar = (FX_WCHAR)item.m_CharCode;
         }
         if (!wChar) {
             continue;
         }
         if (pBidiChar->AppendChar(wChar)) {
-            int32_t ret = pBidiChar->GetBidiInfo(start, count);
-            if (ret == 2) {
+            IFX_BidiChar::Direction ret =
+                pBidiChar->GetBidiInfo(nullptr, nullptr);
+            if (ret == IFX_BidiChar::RIGHT) {
                 nR2L++;
-            }
-            else if (ret == 1) {
+            } else if (ret == IFX_BidiChar::LEFT) {
                 nL2R++;
             }
         }
     }
     if (pBidiChar->EndChar()) {
-        int32_t ret = pBidiChar->GetBidiInfo(start, count);
-        if (ret == 2) {
+        IFX_BidiChar::Direction ret = pBidiChar->GetBidiInfo(nullptr, nullptr);
+        if (ret == IFX_BidiChar::RIGHT) {
             nR2L++;
-        }
-        else if (ret == 1) {
+        } else if (ret == IFX_BidiChar::LEFT) {
             nL2R++;
         }
     }
     return (nR2L > 0 && nR2L >= nL2R);
 }
 int32_t CPDF_TextPage::GetTextObjectWritingMode(const CPDF_TextObject* pTextObj)
 {
     int32_t nChars = pTextObj->CountChars();
     if (nChars == 1) {
         return m_TextlineDir;
@@ skipping 931 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);
 }