Manual fixups to PDF_ENABLE_XFA in core/

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 <cctype>
 #include <cwctype>
 #include <algorithm>
 
@@ skipping 1507 matching lines @@
     ProcessMarkedContent(Obj);
     m_pPreTextObj = pTextObj;
     m_perMatrix.Copy(formMatrix);
     return;
   }
   m_pPreTextObj = pTextObj;
   m_perMatrix.Copy(formMatrix);
   int nItems = pTextObj->CountItems();
   FX_FLOAT baseSpace = _CalculateBaseSpace(pTextObj, matrix);
 
 #ifndef PDF_ENABLE_XFA

[Lei Zhang, 2015/11/25 21:49:01]

Can we flip these to #ifdef PDF_ENABLE_XFA instead? (And move the code block
around, of course) Maybe in another CL?

[Tom Sepez, 2015/11/25 22:05:07]

I made a new version of this file by importing the entire diffing range from one
into the other.  The ifdefs straddle too many function boundaries, etc.

   const FX_BOOL bR2L = IsRightToLeft(pTextObj, pFont, nItems);
   const FX_BOOL bIsBidiAndMirrorInverse =
-#else
+#else   // PDF_ENABLE_XFA
   FX_BOOL bIsBidiAndMirrosInverse = FALSE;
   CFX_BidiChar* BidiChar = new CFX_BidiChar;
   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;
@@ skipping 21 matching lines @@
       nR2L++;
     } else if (ret == CFX_BidiChar::LEFT) {
       nL2R++;
     }
   }
   FX_BOOL bR2L = FALSE;
   if (nR2L > 0 && nR2L >= nL2R) {
     bR2L = TRUE;
   }
   bIsBidiAndMirrosInverse =
-#endif
+#endif  // PDF_ENABLE_XFA
       bR2L && (matrix.a * matrix.d - matrix.b * matrix.c) < 0;
   int32_t iBufStartAppend = m_TempTextBuf.GetLength();
   int32_t iCharListStartAppend = m_TempCharList.GetSize();
 
   FX_FLOAT spacing = 0;
   for (int i = 0; i < nItems; i++) {
     CPDF_TextObjectItem item;
     PAGECHAR_INFO charinfo;
     charinfo.m_OriginX = 0;
     charinfo.m_OriginY = 0;
@@ skipping 184 matching lines @@
     if ((wstrItem.IsEmpty() || wChar == 0) && item.m_CharCode) {
       wChar = (FX_WCHAR)item.m_CharCode;
 #else
   if (bIsBidiAndMirrosInverse) {
     int32_t i, j;
     i = iCharListStartAppend;
     j = m_TempCharList.GetSize() - 1;
     for (; i < j; i++, j--) {
       std::swap(m_TempCharList[i], m_TempCharList[j]);
       std::swap(m_TempCharList[i].m_Index, m_TempCharList[j].m_Index);
-#endif
+#endif  // PDF_ENABLE_XFA
     }
 #ifndef PDF_ENABLE_XFA
     if (!wChar) {
       continue;
     }
     if (pBidiChar->AppendChar(wChar)) {
       CFX_BidiChar::Direction ret = pBidiChar->GetBidiInfo(&start, &count);
       if (ret == CFX_BidiChar::RIGHT) {
         nR2L++;
       } else if (ret == CFX_BidiChar::LEFT) {
         nL2R++;
       }
     }
   }
   if (pBidiChar->EndChar()) {
     CFX_BidiChar::Direction ret = pBidiChar->GetBidiInfo(&start, &count);
     if (ret == CFX_BidiChar::RIGHT) {
       nR2L++;
     } else if (ret == CFX_BidiChar::LEFT) {
       nL2R++;
 #else
     FX_WCHAR* pTempBuffer = m_TempTextBuf.GetBuffer();
     i = iBufStartAppend;
     j = m_TempTextBuf.GetLength() - 1;
     for (; i < j; i++, j--) {
       std::swap(pTempBuffer[i], pTempBuffer[j]);
-#endif
+#endif  // PDF_ENABLE_XFA
     }
   }
 #ifndef PDF_ENABLE_XFA
   return (nR2L > 0 && nR2L >= nL2R);
-#endif
+#endif  // PDF_ENABLE_XFA
 }
 int32_t CPDF_TextPage::GetTextObjectWritingMode(
     const CPDF_TextObject* pTextObj) {
   int32_t nChars = pTextObj->CountChars();
   if (nChars == 1) {
     return m_TextlineDir;
   }
   CPDF_TextObjectItem first, last;
   pTextObj->GetCharInfo(0, &first);
   pTextObj->GetCharInfo(nChars - 1, &last);
@@ skipping 969 matching lines @@
   if (!m_bIsParsed || 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);
 }