Manual fixups to PDF_ENABLE_XFA in core/

core/src/fpdftext/fpdf_text_int.cpp

Index: core/src/fpdftext/fpdf_text_int.cpp
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp
index c69ffc8ee831cd0c5de256082a8562ece5b577c4..e62120cc68c6e5a0a83c5bce71f20cb203f952ba 100644
--- a/core/src/fpdftext/fpdf_text_int.cpp
+++ b/core/src/fpdftext/fpdf_text_int.cpp
@@ -1528,7 +1528,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj) {
 #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;
@@ -1570,7 +1570,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj) {
     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();
@@ -1775,7 +1775,7 @@ FX_BOOL CPDF_TextPage::IsRightToLeft(const CPDF_TextObject* pTextObj,
     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) {
@@ -1802,12 +1802,12 @@ FX_BOOL CPDF_TextPage::IsRightToLeft(const CPDF_TextObject* pTextObj,
     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) {