From 8d2aae7ee320da3a8ffe01c57e38b3f98443257d Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Jul 2015 12:08:12 -0700 Subject: Revert "FX Bool considered harmful, part 3" This reverts commit ff46aaf499edcf153ee2f57c7016587aa96dcfa0. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1255293002 . --- core/src/fpdftext/fpdf_text.cpp | 50 ++--- core/src/fpdftext/fpdf_text_int.cpp | 352 ++++++++++++++++----------------- core/src/fpdftext/fpdf_text_search.cpp | 46 ++--- core/src/fpdftext/text_int.h | 60 +++--- core/src/fpdftext/txtproc.h | 10 +- 5 files changed, 259 insertions(+), 259 deletions(-) (limited to 'core/src/fpdftext') diff --git a/core/src/fpdftext/fpdf_text.cpp b/core/src/fpdftext/fpdf_text.cpp index 7d728a8ae7..7203a694ab 100644 --- a/core/src/fpdftext/fpdf_text.cpp +++ b/core/src/fpdftext/fpdf_text.cpp @@ -289,7 +289,7 @@ void CTextPage::WriteOutput(CFX_WideStringArray& lines, int iMinWidth) } void NormalizeCompositeChar(FX_WCHAR wChar, CFX_WideString& sDest) { - wChar = FX_GetMirrorChar(wChar, true, false); + wChar = FX_GetMirrorChar(wChar, TRUE, FALSE); FX_WCHAR* pDst = NULL; FX_STRSIZE nCount = FX_Unicode_GetNormalization(wChar, pDst); if (nCount < 1 ) { @@ -311,7 +311,7 @@ void NormalizeString(CFX_WideString& str) CFX_WideString sBuffer; nonstd::unique_ptr pBidiChar(IFX_BidiChar::Create()); CFX_WordArray order; - bool bR2L = false; + FX_BOOL bR2L = FALSE; int32_t start = 0, count = 0, i = 0; int nR2L = 0, nL2R = 0; for (i = 0; i < str.GetLength(); i++) { @@ -343,7 +343,7 @@ void NormalizeString(CFX_WideString& str) } } if(nR2L > 0 && nR2L >= nL2R) { - bR2L = true; + bR2L = TRUE; } if(bR2L) { int count = order.GetSize(); @@ -357,7 +357,7 @@ void NormalizeString(CFX_WideString& str) } } else { i = j; - bool bSymbol = false; + FX_BOOL bSymbol = FALSE; while(i > 0 && order.GetAt(i) != 2) { bSymbol = !order.GetAt(i); i -= 3; @@ -389,7 +389,7 @@ void NormalizeString(CFX_WideString& str) } } else { int count = order.GetSize(); - bool bL2R = false; + FX_BOOL bL2R = FALSE; for(int j = 0; j < count; j += 3) { int ret = order.GetAt(j + 2); int start = order.GetAt(j); @@ -405,7 +405,7 @@ void NormalizeString(CFX_WideString& str) } if(i == 3) { j = -3; - bL2R = true; + bL2R = TRUE; continue; } int end = str.GetLength() - 1; @@ -427,15 +427,15 @@ void NormalizeString(CFX_WideString& str) str.Empty(); str += sBuffer; } -static bool IsNumber(CFX_WideString& str) +static FX_BOOL IsNumber(CFX_WideString& str) { for (int i = 0; i < str.GetLength(); i ++) { FX_WCHAR ch = str[i]; if ((ch < '0' || ch > '9') && ch != '-' && ch != '+' && ch != '.' && ch != ' ') { - return false; + return FALSE; } } - return true; + return TRUE; } void CTextPage::FindColumns() { @@ -534,18 +534,18 @@ void CTextBaseLine::InsertTextBox(FX_FLOAT leftx, FX_FLOAT rightx, FX_FLOAT topy pText->m_pColumn = NULL; m_TextList.InsertAt(i, pText); } -bool GetIntersection(FX_FLOAT low1, FX_FLOAT high1, FX_FLOAT low2, FX_FLOAT high2, +FX_BOOL GetIntersection(FX_FLOAT low1, FX_FLOAT high1, FX_FLOAT low2, FX_FLOAT high2, FX_FLOAT& interlow, FX_FLOAT& interhigh); -bool CTextBaseLine::CanMerge(CTextBaseLine* pOther) +FX_BOOL CTextBaseLine::CanMerge(CTextBaseLine* pOther) { FX_FLOAT inter_top, inter_bottom; if (!GetIntersection(m_Bottom, m_Top, pOther->m_Bottom, pOther->m_Top, inter_bottom, inter_top)) { - return false; + return FALSE; } FX_FLOAT inter_h = inter_top - inter_bottom; if (inter_h < (m_Top - m_Bottom) / 2 && inter_h < (pOther->m_Top - pOther->m_Bottom) / 2) { - return false; + return FALSE; } FX_FLOAT dy = (FX_FLOAT)FXSYS_fabs(m_BaseLine - pOther->m_BaseLine); for (int i = 0; i < m_TextList.GetSize(); i ++) { @@ -563,11 +563,11 @@ bool CTextBaseLine::CanMerge(CTextBaseLine* pOther) } if (dy >= (pText->m_Bottom - pText->m_Top) / 2 || dy >= (pOtherText->m_Bottom - pOtherText->m_Top) / 2) { - return false; + return FALSE; } } } - return true; + return TRUE; } void CTextBaseLine::Merge(CTextBaseLine* pOther) { @@ -577,7 +577,7 @@ void CTextBaseLine::Merge(CTextBaseLine* pOther) pText->m_SpaceWidth, pText->m_FontSizeV, pText->m_Text); } } -bool CTextBaseLine::GetWidth(FX_FLOAT& leftx, FX_FLOAT& rightx) +FX_BOOL CTextBaseLine::GetWidth(FX_FLOAT& leftx, FX_FLOAT& rightx) { int i; for (i = 0; i < m_TextList.GetSize(); i ++) { @@ -587,7 +587,7 @@ bool CTextBaseLine::GetWidth(FX_FLOAT& leftx, FX_FLOAT& rightx) } } if (i == m_TextList.GetSize()) { - return false; + return FALSE; } CTextBox* pText = (CTextBox*)m_TextList.GetAt(i); leftx = pText->m_Left; @@ -599,7 +599,7 @@ bool CTextBaseLine::GetWidth(FX_FLOAT& leftx, FX_FLOAT& rightx) } pText = (CTextBox*)m_TextList.GetAt(i); rightx = pText->m_Right; - return true; + return TRUE; } void CTextBaseLine::MergeBoxes() { @@ -724,8 +724,8 @@ void PDF_GetPageText_Unicode(CFX_WideStringArray& lines, CPDF_Document* pDoc, CP CPDF_Page page; page.Load(pDoc, pPage); CPDF_ParseOptions options; - options.m_bTextOnly = true; - options.m_bSeparateForm = false; + options.m_bTextOnly = TRUE; + options.m_bSeparateForm = FALSE; page.ParseContent(&options); CFX_FloatRect page_bbox = page.GetPageBBox(); if (flags & PDF2TXT_AUTO_ROTATE) { @@ -734,7 +734,7 @@ void PDF_GetPageText_Unicode(CFX_WideStringArray& lines, CPDF_Document* pDoc, CP CTextPage texts; texts.m_bAutoWidth = flags & PDF2TXT_AUTO_WIDTH; texts.m_bKeepColumn = flags & PDF2TXT_KEEP_COLUMN; - texts.m_bBreakSpace = true; + texts.m_bBreakSpace = TRUE; FX_POSITION pos = page.GetFirstObjectPosition(); while (pos) { CPDF_PageObject* pObject = page.GetNextObject(pos); @@ -763,7 +763,7 @@ void PDF_GetPageText(CFX_ByteStringArray& lines, CPDF_Document* pDoc, CPDF_Dicti lines.Add(str); } } -extern void _PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, CPDF_PageObjects* pPage, bool bUseLF, +extern void _PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, CPDF_PageObjects* pPage, FX_BOOL bUseLF, CFX_PtrArray* pObjArray); void PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, CPDF_Document* pDoc, CPDF_Dictionary* pPage, FX_DWORD flags) { @@ -771,8 +771,8 @@ void PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, CPDF_Document* pDoc, CPD CPDF_Page page; page.Load(pDoc, pPage); CPDF_ParseOptions options; - options.m_bTextOnly = true; - options.m_bSeparateForm = false; + options.m_bTextOnly = TRUE; + options.m_bSeparateForm = FALSE; page.ParseContent(&options); - _PDF_GetTextStream_Unicode(buffer, &page, true, NULL); + _PDF_GetTextStream_Unicode(buffer, &page, TRUE, NULL); } diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index f777a3d90b..c1aaad8b5c 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -19,10 +19,10 @@ namespace { -bool _IsIgnoreSpaceCharacter(FX_WCHAR curChar) +FX_BOOL _IsIgnoreSpaceCharacter(FX_WCHAR curChar) { if(curChar < 255 ) { - return false; + return FALSE; } if ( (curChar >= 0x0600 && curChar <= 0x06FF) || (curChar >= 0xFE70 && curChar <= 0xFEFF) @@ -33,9 +33,9 @@ bool _IsIgnoreSpaceCharacter(FX_WCHAR curChar) || (curChar >= 0x2DE0 && curChar <= 0x2DFF) || curChar == 8467 || (curChar >= 0x2000 && curChar <= 0x206F)) { - return false; + return FALSE; } - return true; + return TRUE; } FX_FLOAT _NormalizeThreshold(FX_FLOAT threshold) @@ -58,7 +58,7 @@ FX_FLOAT _CalculateBaseSpace(const CPDF_TextObject* pTextObj, FX_FLOAT baseSpace = 0.0; const int nItems = pTextObj->CountItems(); if (pTextObj->m_TextState.GetObject()->m_CharSpace && nItems >= 3) { - bool bAllChar = true; + FX_BOOL bAllChar = TRUE; FX_FLOAT spacing = matrix.TransformDistance( pTextObj->m_TextState.GetObject()->m_CharSpace); baseSpace = spacing; @@ -69,7 +69,7 @@ FX_FLOAT _CalculateBaseSpace(const CPDF_TextObject* pTextObj, FX_FLOAT fontsize_h = pTextObj->m_TextState.GetFontSizeH(); FX_FLOAT kerning = -fontsize_h * item.m_OriginX / 1000; baseSpace = std::min(baseSpace, kerning + spacing); - bAllChar = false; + bAllChar = FALSE; } } if (baseSpace < 0.0 || (nItems == 3 && !bAllChar)) { @@ -82,7 +82,7 @@ FX_FLOAT _CalculateBaseSpace(const CPDF_TextObject* pTextObj, } // namespace CPDFText_ParseOptions::CPDFText_ParseOptions() - : m_bGetCharCodeOnly(false), m_bNormalizeObjs(true), m_bOutputHyphen(false) + : m_bGetCharCodeOnly(FALSE), m_bNormalizeObjs(TRUE), m_bOutputHyphen(FALSE) { } IPDF_TextPage* IPDF_TextPage::CreateTextPage(const CPDF_Page* pPage, CPDFText_ParseOptions ParserOptions) @@ -120,7 +120,7 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_Page* pPage, int flags) : m_charList(512), m_TempCharList(50), m_pPreTextObj(NULL), - m_IsParsered(false), + m_IsParsered(FALSE), m_TextlineDir(-1), m_CurlineRect(0, 0, 0, 0) { @@ -134,7 +134,7 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_Page* pPage, CPDFText_ParseOptions Parse , m_charList(512) , m_TempCharList(50) , m_pPreTextObj(NULL) - , m_IsParsered(false) + , m_IsParsered(FALSE) , m_TextlineDir(-1) , m_CurlineRect(0, 0, 0, 0) { @@ -147,7 +147,7 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_PageObjects* pPage, int flags) : m_charList(512), m_TempCharList(50), m_pPreTextObj(NULL), - m_IsParsered(false), + m_IsParsered(FALSE), m_TextlineDir(-1), m_CurlineRect(0, 0, 0, 0) { @@ -157,7 +157,7 @@ CPDF_TextPage::CPDF_TextPage(const CPDF_PageObjects* pPage, int flags) CFX_FloatRect pageRect = pPage->CalcBoundingBox(); m_DisplayMatrix = CFX_AffineMatrix(1, 0, 0, -1, pageRect.right, pageRect.top); } -void CPDF_TextPage::NormalizeObjects(bool bNormalize) +void CPDF_TextPage::NormalizeObjects(FX_BOOL bNormalize) { m_ParseOptions.m_bNormalizeObjs = bNormalize; } @@ -177,18 +177,18 @@ bool CPDF_TextPage::IsControlChar(const PAGECHAR_INFO& charInfo) return false; } } -bool CPDF_TextPage::ParseTextPage() +FX_BOOL CPDF_TextPage::ParseTextPage() { if (!m_pPage) { - m_IsParsered = false; - return false; + m_IsParsered = FALSE; + return FALSE; } - m_IsParsered = false; + m_IsParsered = FALSE; m_TextBuf.Clear(); m_charList.RemoveAll(); m_pPreTextObj = NULL; ProcessObject(); - m_IsParsered = true; + m_IsParsered = TRUE; if(!m_ParseOptions.m_bGetCharCodeOnly) { m_CharIndex.RemoveAll(); int nCount = m_charList.GetSize(); @@ -197,15 +197,15 @@ bool CPDF_TextPage::ParseTextPage() } for(int i = 0; i < nCount; i++) { int indexSize = m_CharIndex.GetSize(); - bool bNormal = false; + FX_BOOL bNormal = FALSE; PAGECHAR_INFO charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(i); if(charinfo.m_Flag == FPDFTEXT_CHAR_GENERATED) { - bNormal = true; + bNormal = TRUE; } else if(charinfo.m_Unicode == 0 || IsControlChar(charinfo)) - bNormal = false; + bNormal = FALSE; else { - bNormal = true; + bNormal = TRUE; } if(bNormal) { if(indexSize % 2) { @@ -232,7 +232,7 @@ bool CPDF_TextPage::ParseTextPage() m_CharIndex.RemoveAt(indexSize - 1); } } - return true; + return TRUE; } int CPDF_TextPage::CountChars() const { @@ -283,7 +283,7 @@ void CPDF_TextPage::GetRectArray(int start, int nCount, CFX_RectArray& rectArray CPDF_TextObject* pCurObj = NULL; CFX_FloatRect rect; int curPos = start; - bool flagNewRect = true; + FX_BOOL flagNewRect = TRUE; if (nCount + start > m_charList.GetSize() || nCount == -1) { nCount = m_charList.GetSize() - start; } @@ -301,7 +301,7 @@ void CPDF_TextPage::GetRectArray(int start, int nCount, CFX_RectArray& rectArray if (pCurObj != info_curchar.m_pTextObj) { rectArray.Add(rect); pCurObj = info_curchar.m_pTextObj; - flagNewRect = true; + flagNewRect = TRUE; } if (flagNewRect) { FX_FLOAT orgX = info_curchar.m_OriginX, orgY = info_curchar.m_OriginY; @@ -326,7 +326,7 @@ void CPDF_TextPage::GetRectArray(int start, int nCount, CFX_RectArray& rectArray } else { rect.top = info_curchar.m_CharBox.top; } - flagNewRect = false; + flagNewRect = FALSE; rect = info_curchar.m_CharBox; rect.Normalize(); } else { @@ -399,8 +399,8 @@ CFX_WideString CPDF_TextPage::GetTextByRect(const CFX_FloatRect& rect) const int nCount = m_charList.GetSize(); int pos = 0; FX_FLOAT posy = 0; - bool IsContainPreChar = false; - bool ISAddLineFeed = false; + FX_BOOL IsContainPreChar = FALSE; + FX_BOOL ISAddLineFeed = FALSE; while (pos < nCount) { PAGECHAR_INFO charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(pos++); if (IsRectIntersect(rect, charinfo.m_CharBox)) { @@ -410,20 +410,20 @@ CFX_WideString CPDF_TextPage::GetTextByRect(const CFX_FloatRect& rect) const strText += L"\r\n"; } } - IsContainPreChar = true; - ISAddLineFeed = false; + IsContainPreChar = TRUE; + ISAddLineFeed = FALSE; if (charinfo.m_Unicode) { strText += charinfo.m_Unicode; } } else if (charinfo.m_Unicode == 32) { if (IsContainPreChar && charinfo.m_Unicode) { strText += charinfo.m_Unicode; - IsContainPreChar = false; - ISAddLineFeed = false; + IsContainPreChar = FALSE; + ISAddLineFeed = FALSE; } } else { - IsContainPreChar = false; - ISAddLineFeed = true; + IsContainPreChar = FALSE; + ISAddLineFeed = TRUE; } } return strText; @@ -437,7 +437,7 @@ void CPDF_TextPage::GetRectsArrayByRect(const CFX_FloatRect& rect, CFX_RectArray return; } CFX_FloatRect curRect; - bool flagNewRect = true; + FX_BOOL flagNewRect = TRUE; CPDF_TextObject* pCurObj = NULL; int nCount = m_charList.GetSize(); int pos = 0; @@ -453,11 +453,11 @@ void CPDF_TextPage::GetRectsArrayByRect(const CFX_FloatRect& rect, CFX_RectArray if (pCurObj != info_curchar.m_pTextObj) { resRectArray.Add(curRect); pCurObj = info_curchar.m_pTextObj; - flagNewRect = true; + flagNewRect = TRUE; } if (flagNewRect) { curRect = info_curchar.m_CharBox; - flagNewRect = false; + flagNewRect = FALSE; curRect.Normalize(); } else { info_curchar.m_CharBox.Normalize(); @@ -626,13 +626,13 @@ void CPDF_TextPage::GetRect(int rectIndex, FX_FLOAT& left, FX_FLOAT& top, FX_FLO right = m_SelRects.GetAt(rectIndex).right; bottom = m_SelRects.GetAt(rectIndex).bottom; } -bool CPDF_TextPage::GetBaselineRotate(int start, int end, int& Rotate) +FX_BOOL CPDF_TextPage::GetBaselineRotate(int start, int end, int& Rotate) { if(m_ParseOptions.m_bGetCharCodeOnly) { - return false; + return FALSE; } if(end == start) { - return false; + return FALSE; } FX_FLOAT dx, dy; FPDF_CHAR_INFO info1, info2; @@ -641,7 +641,7 @@ bool CPDF_TextPage::GetBaselineRotate(int start, int end, int& Rotate) while(info2.m_CharBox.Width() == 0 || info2.m_CharBox.Height() == 0) { end--; if(end <= start) { - return false; + return FALSE; } GetCharInfo(end, info2); } @@ -664,16 +664,16 @@ bool CPDF_TextPage::GetBaselineRotate(int start, int end, int& Rotate) } else if(Rotate > 0) { Rotate = 360 - Rotate; } - return true; + return TRUE; } -bool CPDF_TextPage::GetBaselineRotate(const CFX_FloatRect& rect , int& Rotate) +FX_BOOL CPDF_TextPage::GetBaselineRotate(const CFX_FloatRect& rect , int& Rotate) { if(m_ParseOptions.m_bGetCharCodeOnly) { - return false; + return FALSE; } - int start, end, count, n = CountBoundedSegments(rect.left, rect.top, rect.right, rect.bottom, true); + int start, end, count, n = CountBoundedSegments(rect.left, rect.top, rect.right, rect.bottom, TRUE); if(n < 1) { - return false; + return FALSE; } if(n > 1) { GetBoundedSegment(n - 1, start, count); @@ -685,18 +685,18 @@ bool CPDF_TextPage::GetBaselineRotate(const CFX_FloatRect& rect , int& Rotate) } return GetBaselineRotate(start, end, Rotate); } -bool CPDF_TextPage::GetBaselineRotate(int rectIndex, int& Rotate) +FX_BOOL CPDF_TextPage::GetBaselineRotate(int rectIndex, int& Rotate) { if(m_ParseOptions.m_bGetCharCodeOnly) { - return false; + return FALSE; } if (!m_IsParsered || rectIndex < 0 || rectIndex > m_SelRects.GetSize()) { - return false; + return FALSE; } CFX_FloatRect rect = m_SelRects.GetAt(rectIndex); return GetBaselineRotate(rect , Rotate); } -int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT right, FX_FLOAT bottom, bool bContains ) +int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT right, FX_FLOAT bottom, FX_BOOL bContains ) { if(m_ParseOptions.m_bGetCharCodeOnly) { return -1; @@ -712,8 +712,8 @@ int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT ri FPDF_SEGMENT segment; segment.m_Start = 0; segment.m_nCount = 0; - bool segmentStatus = 0; - bool IsContainPreChar = false; + FX_BOOL segmentStatus = 0; + FX_BOOL IsContainPreChar = FALSE; while (pos < nCount) { PAGECHAR_INFO charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(pos); if(bContains && rect.Contains(charinfo.m_CharBox)) { @@ -724,7 +724,7 @@ int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT ri } else if (segmentStatus == 1) { segment.m_nCount++; } - IsContainPreChar = true; + IsContainPreChar = TRUE; } else if (!bContains && (IsRectIntersect(rect, charinfo.m_CharBox) || rect.Contains(charinfo.m_OriginX, charinfo.m_OriginY))) { if (segmentStatus == 0 || segmentStatus == 2) { segment.m_Start = pos; @@ -733,9 +733,9 @@ int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT ri } else if (segmentStatus == 1) { segment.m_nCount++; } - IsContainPreChar = true; + IsContainPreChar = TRUE; } else if (charinfo.m_Unicode == 32) { - if (IsContainPreChar == true) { + if (IsContainPreChar == TRUE) { if (segmentStatus == 0 || segmentStatus == 2) { segment.m_Start = pos; segment.m_nCount = 1; @@ -743,7 +743,7 @@ int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT ri } else if (segmentStatus == 1) { segment.m_nCount++; } - IsContainPreChar = false; + IsContainPreChar = FALSE; } else { if (segmentStatus == 1) { segmentStatus = 2; @@ -759,7 +759,7 @@ int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT ri segment.m_Start = 0; segment.m_nCount = 0; } - IsContainPreChar = false; + IsContainPreChar = FALSE; } pos++; } @@ -1053,7 +1053,7 @@ void CPDF_TextPage::AddCharInfoByRLDirection(CFX_WideString& str, int i) PAGECHAR_INFO Info = *(PAGECHAR_INFO*)m_TempCharList.GetAt(i); if(!IsControlChar(Info)) { Info.m_Index = m_TextBuf.GetLength(); - FX_WCHAR wChar = FX_GetMirrorChar(str.GetAt(i), true, false); + FX_WCHAR wChar = FX_GetMirrorChar(str.GetAt(i), TRUE, FALSE); FX_WCHAR* pDst = NULL; FX_STRSIZE nCount = FX_Unicode_GetNormalization(wChar, pDst); if (nCount >= 1) { @@ -1089,10 +1089,10 @@ void CPDF_TextPage::CloseTempLine() nonstd::unique_ptr pBidiChar(IFX_BidiChar::Create()); CFX_WideString str = m_TempTextBuf.GetWideString(); CFX_WordArray order; - bool bR2L = false; + FX_BOOL bR2L = FALSE; int32_t start = 0, count = 0; int nR2L = 0, nL2R = 0; - bool bPrevSpace = false; + FX_BOOL bPrevSpace = FALSE; for (int i = 0; i < str.GetLength(); i++) { if(str.GetAt(i) == 32) { if(bPrevSpace) { @@ -1103,9 +1103,9 @@ void CPDF_TextPage::CloseTempLine() i--; continue; } - bPrevSpace = true; + bPrevSpace = TRUE; } else { - bPrevSpace = false; + bPrevSpace = FALSE; } if(pBidiChar->AppendChar(str.GetAt(i))) { int32_t ret = pBidiChar->GetBidiInfo(start, count); @@ -1135,7 +1135,7 @@ void CPDF_TextPage::CloseTempLine() } } if(nR2L > 0 && nR2L >= nL2R) { - bR2L = true; + bR2L = TRUE; } if (m_parserflag == FPDFTEXT_RLTB || bR2L) { int count = order.GetSize(); @@ -1149,7 +1149,7 @@ void CPDF_TextPage::CloseTempLine() } } else { int j = i; - bool bSymbol = false; + FX_BOOL bSymbol = FALSE; while(j > 0 && order.GetAt(j) != 2) { bSymbol = !order.GetAt(j); j -= 3; @@ -1181,7 +1181,7 @@ void CPDF_TextPage::CloseTempLine() } } else { int count = order.GetSize(); - bool bL2R = false; + FX_BOOL bL2R = FALSE; for(int i = 0; i < count; i += 3) { int ret = order.GetAt(i + 2); int start = order.GetAt(i); @@ -1197,7 +1197,7 @@ void CPDF_TextPage::CloseTempLine() } if(j == 3) { i = -3; - bL2R = true; + bL2R = TRUE; continue; } int end = m_TempCharList.GetSize() - 1; @@ -1307,7 +1307,7 @@ int32_t CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj) return FPDFTEXT_MC_PASS; } CFX_WideString actText; - bool bExist = false; + FX_BOOL bExist = FALSE; CPDF_Dictionary* pDict = NULL; int n = 0; for (n = 0; n < nContentMark; n++) { @@ -1316,7 +1316,7 @@ int32_t CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj) pDict = (CPDF_Dictionary*)item.GetParam(); CPDF_String* temp = (CPDF_String*)(pDict ? pDict->GetElement(FX_BSTRC("ActualText")) : NULL); if (temp) { - bExist = true; + bExist = TRUE; actText = temp->GetUnicodeText(); } } @@ -1338,24 +1338,24 @@ int32_t CPDF_TextPage::PreMarkedContent(PDFTEXT_Obj Obj) if (nItems < 1) { return FPDFTEXT_MC_PASS; } - bExist = false; + bExist = FALSE; for (FX_STRSIZE i = 0; i < nItems; i++) { FX_WCHAR wChar = actText.GetAt(i); if (-1 == pFont->CharCodeFromUnicode(wChar)) { continue; } else { - bExist = true; + bExist = TRUE; break; } } if (!bExist) { return FPDFTEXT_MC_PASS; } - bExist = false; + bExist = FALSE; for (FX_STRSIZE i = 0; i < nItems; i++) { FX_WCHAR wChar = actText.GetAt(i); if ((wChar > 0x80 && wChar < 0xFFFD) || (wChar <= 0x80 && isprint(wChar))) { - bExist = true; + bExist = TRUE; break; } } @@ -1539,8 +1539,8 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj) int nItems = pTextObj->CountItems(); FX_FLOAT baseSpace = _CalculateBaseSpace(pTextObj, matrix); - const bool bR2L = IsRightToLeft(pTextObj, pFont, nItems); - const bool bIsBidiAndMirrorInverse = + const FX_BOOL bR2L = IsRightToLeft(pTextObj, pFont, nItems); + const FX_BOOL bIsBidiAndMirrorInverse = bR2L && (matrix.a * matrix.d - matrix.b * matrix.c) < 0; int32_t iBufStartAppend = m_TempTextBuf.GetLength(); int32_t iCharListStartAppend = m_TempCharList.GetSize(); @@ -1609,7 +1609,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj) } spacing = 0; CFX_WideString wstrItem = pFont->UnicodeFromCharCode(item.m_CharCode); - bool bNoUnicode = false; + FX_BOOL bNoUnicode = FALSE; FX_WCHAR wChar = wstrItem.GetAt(0); if ((wstrItem.IsEmpty() || wChar == 0) && item.m_CharCode) { if(wstrItem.IsEmpty()) { @@ -1617,7 +1617,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj) } else { wstrItem.SetAt(0, (FX_WCHAR)item.m_CharCode); } - bNoUnicode = true; + bNoUnicode = TRUE; } charinfo.m_Index = -1; charinfo.m_CharCode = item.m_CharCode; @@ -1651,7 +1651,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj) continue; } else { int nTotal = wstrItem.GetLength(); - bool bDel = false; + FX_BOOL bDel = FALSE; const int count = std::min(m_TempCharList.GetSize(), 7); FX_FLOAT threshold = charinfo.m_Matrix.TransformXDistance((FX_FLOAT)TEXT_CHARRATIO_GAPDELTA * pTextObj->GetFontSize()); for (int n = m_TempCharList.GetSize(); @@ -1662,7 +1662,7 @@ void CPDF_TextPage::ProcessTextObject(PDFTEXT_Obj Obj) charinfo1->m_pTextObj->GetFont() == charinfo.m_pTextObj->GetFont() && FXSYS_fabs(charinfo1->m_OriginX - charinfo.m_OriginX) < threshold && FXSYS_fabs(charinfo1->m_OriginY - charinfo.m_OriginY) < threshold) { - bDel = true; + bDel = TRUE; break; } } @@ -1707,7 +1707,7 @@ void CPDF_TextPage::SwapTempTextBuf(int32_t iCharListStartAppend, std::swap(pTempBuffer[i], pTempBuffer[j]); } } -bool CPDF_TextPage::IsRightToLeft(const CPDF_TextObject* pTextObj, +FX_BOOL CPDF_TextPage::IsRightToLeft(const CPDF_TextObject* pTextObj, const CPDF_Font* pFont, int nItems) const { @@ -1779,7 +1779,7 @@ int32_t CPDF_TextPage::GetTextObjectWritingMode(const CPDF_TextObject* pTextObj) } return m_TextlineDir; } -bool CPDF_TextPage::IsHyphen(FX_WCHAR curChar) +FX_BOOL CPDF_TextPage::IsHyphen(FX_WCHAR curChar) { CFX_WideString strCurText = m_TempTextBuf.GetWideString(); if(strCurText.GetLength() == 0) { @@ -1796,7 +1796,7 @@ bool CPDF_TextPage::IsHyphen(FX_WCHAR curChar) FX_WCHAR preChar = strCurText.GetAt((nIndex)); if (((preChar >= L'A' && preChar <= L'Z') || (preChar >= L'a' && preChar <= L'z')) && ((curChar >= L'A' && curChar <= L'Z') || (curChar >= L'a' && curChar <= L'z'))) { - return true; + return TRUE; } } int size = m_TempCharList.GetSize(); @@ -1806,21 +1806,21 @@ bool CPDF_TextPage::IsHyphen(FX_WCHAR curChar) } else { size = m_charList.GetSize(); if(size == 0) { - return false; + return FALSE; } preChar = (PAGECHAR_INFO)m_charList[size - 1]; } if (FPDFTEXT_CHAR_PIECE == preChar.m_Flag) if (0xAD == preChar.m_Unicode || 0x2D == preChar.m_Unicode) { - return true; + return TRUE; } } - return false; + return FALSE; } int CPDF_TextPage::ProcessInsertObject(const CPDF_TextObject* pObj, const CFX_AffineMatrix& formMatrix) { FindPreviousTextObject(); - bool bNewline = false; + FX_BOOL bNewline = FALSE; int WritingMode = GetTextObjectWritingMode(pObj); if(WritingMode == -1) { WritingMode = GetTextObjectWritingMode(m_pPreTextObj); @@ -1884,8 +1884,8 @@ int CPDF_TextPage::ProcessInsertObject(const CPDF_TextObject* pObj, const CFX_Af rect1.Intersect(rect2); if (WritingMode == 0) { if ((rect1.IsEmpty() && rect2.Height() > 5 && rect3.Height() > 5) - || ((y > threshold * 2 || y < threshold * -3) && (FXSYS_fabs(y) < 1 ? FXSYS_fabs(x) < FXSYS_fabs(y) : true))) { - bNewline = true; + || ((y > threshold * 2 || y < threshold * -3) && (FXSYS_fabs(y) < 1 ? FXSYS_fabs(x) < FXSYS_fabs(y) : TRUE))) { + bNewline = TRUE; if(nItem > 1 ) { CPDF_TextObjectItem tempItem; m_pPreTextObj->GetItemInfo(0, &tempItem); @@ -1897,11 +1897,11 @@ int CPDF_TextPage::ProcessInsertObject(const CPDF_TextObject* pObj, const CFX_Af && m.b < 0.1 && m.c < 0.1 ) { CFX_FloatRect re(0, m_pPreTextObj->m_Bottom, 1000, m_pPreTextObj->m_Top); if(re.Contains(pObj->GetPosX(), pObj->GetPosY())) { - bNewline = false; + bNewline = FALSE; } else { CFX_FloatRect re(0, pObj->m_Bottom, 1000, pObj->m_Top); if(re.Contains(m_pPreTextObj->GetPosX(), m_pPreTextObj->GetPosY())) { - bNewline = false; + bNewline = FALSE; } } } @@ -1952,10 +1952,10 @@ int CPDF_TextPage::ProcessInsertObject(const CPDF_TextObject* pObj, const CFX_Af } return 0; } -bool CPDF_TextPage::IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject* pTextObj2) +FX_BOOL CPDF_TextPage::IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject* pTextObj2) { if (!pTextObj1 || !pTextObj2) { - return false; + return FALSE; } CFX_FloatRect rcPreObj(pTextObj2->m_Left, pTextObj2->m_Bottom, pTextObj2->m_Right, pTextObj2->m_Top); CFX_FloatRect rcCurObj(pTextObj1->m_Left, pTextObj1->m_Bottom, pTextObj1->m_Right, pTextObj1->m_Top); @@ -1966,46 +1966,46 @@ bool CPDF_TextPage::IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject PAGECHAR_INFO perCharTemp = (PAGECHAR_INFO)m_charList[nCount - 2]; FX_FLOAT dbSpace = perCharTemp.m_CharBox.Width(); if (dbXdif > dbSpace) { - return false; + return FALSE; } } } if (!rcPreObj.IsEmpty() || !rcCurObj.IsEmpty()) { rcPreObj.Intersect(rcCurObj); if (rcPreObj.IsEmpty()) { - return false; + return FALSE; } if (FXSYS_fabs(rcPreObj.Width() - rcCurObj.Width()) > rcCurObj.Width() / 2) { - return false; + return FALSE; } if (pTextObj2->GetFontSize() != pTextObj1->GetFontSize()) { - return false; + return FALSE; } } int nPreCount = pTextObj2->CountItems(); int nCurCount = pTextObj1->CountItems(); if (nPreCount != nCurCount) { - return false; + return FALSE; } CPDF_TextObjectItem itemPer, itemCur; for (int i = 0; i < nPreCount; i++) { pTextObj2->GetItemInfo(i, &itemPer); pTextObj1->GetItemInfo(i, &itemCur); if (itemCur.m_CharCode != itemPer.m_CharCode) { - return false; + return FALSE; } } if(FXSYS_fabs(pTextObj1->GetPosX() - pTextObj2->GetPosX()) > GetCharWidth(itemPer.m_CharCode, pTextObj2->GetFont())*pTextObj2->GetFontSize() / 1000 * 0.9 || FXSYS_fabs(pTextObj1->GetPosY() - pTextObj2->GetPosY()) > FX_MAX(FX_MAX(rcPreObj.Height() , rcPreObj.Width()), pTextObj2->GetFontSize()) / 8) { - return false; + return FALSE; } - return true; + return TRUE; } -bool CPDF_TextPage::IsSameAsPreTextObject(CPDF_TextObject* pTextObj, FX_POSITION ObjPos) +FX_BOOL CPDF_TextPage::IsSameAsPreTextObject(CPDF_TextObject* pTextObj, FX_POSITION ObjPos) { if (!pTextObj) { - return false; + return FALSE; } int i = 0; if (!ObjPos) { @@ -2021,13 +2021,13 @@ bool CPDF_TextPage::IsSameAsPreTextObject(CPDF_TextObject* pTextObj, FX_POSITION continue; } if(IsSameTextObject((CPDF_TextObject*)pObj, pTextObj)) { - return true; + return TRUE; } i++; } - return false; + return FALSE; } -bool CPDF_TextPage::GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info) +FX_BOOL CPDF_TextPage::GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info) { int size = m_TempCharList.GetSize(); PAGECHAR_INFO preChar; @@ -2036,7 +2036,7 @@ bool CPDF_TextPage::GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info) } else { size = m_charList.GetSize(); if(size == 0) { - return false; + return FALSE; } preChar = (PAGECHAR_INFO)m_charList[size - 1]; } @@ -2061,37 +2061,37 @@ bool CPDF_TextPage::GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info) info.m_OriginX = preChar.m_OriginX + preWidth * (fs) / 1000; info.m_OriginY = preChar.m_OriginY; info.m_CharBox = CFX_FloatRect(info.m_OriginX, info.m_OriginY, info.m_OriginX, info.m_OriginY); - return true; + return TRUE; } -bool CPDF_TextPage::IsRectIntersect(const CFX_FloatRect& rect1, const CFX_FloatRect& rect2) +FX_BOOL CPDF_TextPage::IsRectIntersect(const CFX_FloatRect& rect1, const CFX_FloatRect& rect2) { CFX_FloatRect rect = rect1; rect.Intersect(rect2); return !rect.IsEmpty(); } -bool CPDF_TextPage::IsLetter(FX_WCHAR unicode) +FX_BOOL CPDF_TextPage::IsLetter(FX_WCHAR unicode) { if (unicode < L'A') { - return false; + return FALSE; } if (unicode > L'Z' && unicode < L'a') { - return false; + return FALSE; } if (unicode > L'z') { - return false; + return FALSE; } - return true; + return TRUE; } CPDF_TextPageFind::CPDF_TextPageFind(const IPDF_TextPage* pTextPage) : m_pTextPage(pTextPage), m_flags(0), m_findNextStart(-1), m_findPreStart(-1), - m_bMatchCase(false), - m_bMatchWholeWord(false), + m_bMatchCase(FALSE), + m_bMatchWholeWord(FALSE), m_resStart(0), m_resEnd(-1), - m_IsFind(false) + m_IsFind(FALSE) { m_strText = m_pTextPage->GetPageText(); int nCount = pTextPage->CountChars(); @@ -2140,10 +2140,10 @@ int CPDF_TextPageFind::GetCharIndex(int index) const } return -1; } -bool CPDF_TextPageFind::FindFirst(const CFX_WideString& findwhat, int flags, int startPos) +FX_BOOL CPDF_TextPageFind::FindFirst(const CFX_WideString& findwhat, int flags, int startPos) { if (!m_pTextPage) { - return false; + return FALSE; } if (m_strText.IsEmpty() || m_bMatchCase != (flags & FPDFTEXT_MATCHCASE)) { m_strText = m_pTextPage->GetPageText(); @@ -2153,8 +2153,8 @@ bool CPDF_TextPageFind::FindFirst(const CFX_WideString& findwhat, int flags, int m_flags = flags; m_bMatchCase = flags & FPDFTEXT_MATCHCASE; if (m_strText.IsEmpty()) { - m_IsFind = false; - return true; + m_IsFind = FALSE; + return TRUE; } FX_STRSIZE len = findwhatStr.GetLength(); if (!m_bMatchCase) { @@ -2182,36 +2182,36 @@ bool CPDF_TextPageFind::FindFirst(const CFX_WideString& findwhat, int flags, int m_csFindWhatArray.Add(findwhatStr); } if(m_csFindWhatArray.GetSize() <= 0) { - return false; + return FALSE; } - m_IsFind = true; + m_IsFind = TRUE; m_resStart = 0; m_resEnd = -1; - return true; + return TRUE; } -bool CPDF_TextPageFind::FindNext() +FX_BOOL CPDF_TextPageFind::FindNext() { if (!m_pTextPage) { - return false; + return FALSE; } m_resArray.RemoveAll(); if(m_findNextStart == -1) { - return false; + return FALSE; } if(m_strText.IsEmpty()) { - m_IsFind = false; + m_IsFind = FALSE; return m_IsFind; } int strLen = m_strText.GetLength(); if (m_findNextStart > strLen - 1) { - m_IsFind = false; + m_IsFind = FALSE; return m_IsFind; } int nCount = m_csFindWhatArray.GetSize(); int nResultPos = 0; int nStartPos = 0; nStartPos = m_findNextStart; - bool bSpaceStart = false; + FX_BOOL bSpaceStart = FALSE; for(int iWord = 0; iWord < nCount; iWord++) { CFX_WideString csWord = m_csFindWhatArray[iWord]; if(csWord.IsEmpty()) { @@ -2223,33 +2223,33 @@ bool CPDF_TextPageFind::FindNext() } iWord = -1; } else if(iWord == 0) { - bSpaceStart = true; + bSpaceStart = TRUE; } continue; } int endIndex; nResultPos = m_strText.Find(csWord.c_str(), nStartPos); if (nResultPos == -1) { - m_IsFind = false; + m_IsFind = FALSE; return m_IsFind; } endIndex = nResultPos + csWord.GetLength() - 1; if(iWord == 0) { m_resStart = nResultPos; } - bool bMatch = true; + FX_BOOL bMatch = TRUE; if(iWord != 0 && !bSpaceStart) { int PreResEndPos = nStartPos; int curChar = csWord.GetAt(0); CFX_WideString lastWord = m_csFindWhatArray[iWord - 1]; int lastChar = lastWord.GetAt(lastWord.GetLength() - 1); if(nStartPos == nResultPos && !(_IsIgnoreSpaceCharacter(lastChar) || _IsIgnoreSpaceCharacter(curChar))) { - bMatch = false; + bMatch = FALSE; } for(int d = PreResEndPos; d < nResultPos; d++) { FX_WCHAR strInsert = m_strText.GetAt(d); if(strInsert != TEXT_LINEFEED_CHAR && strInsert != TEXT_BLANK_CHAR && strInsert != TEXT_RETURN_CHAR && strInsert != 160) { - bMatch = false; + bMatch = FALSE; break; } } @@ -2257,7 +2257,7 @@ bool CPDF_TextPageFind::FindNext() if(nResultPos > 0) { FX_WCHAR strInsert = m_strText.GetAt(nResultPos - 1); if(strInsert != TEXT_LINEFEED_CHAR && strInsert != TEXT_BLANK_CHAR && strInsert != TEXT_RETURN_CHAR && strInsert != 160) { - bMatch = false; + bMatch = FALSE; m_resStart = nResultPos; } else { m_resStart = nResultPos - 1; @@ -2278,7 +2278,7 @@ bool CPDF_TextPageFind::FindNext() } } m_resEnd = nResultPos + m_csFindWhatArray[m_csFindWhatArray.GetSize() - 1].GetLength() - 1; - m_IsFind = true; + m_IsFind = TRUE; int resStart = GetCharIndex(m_resStart); int resEnd = GetCharIndex(m_resEnd); m_pTextPage->GetRectArray(resStart, resEnd - resStart + 1, m_resArray); @@ -2291,20 +2291,20 @@ bool CPDF_TextPageFind::FindNext() } return m_IsFind; } -bool CPDF_TextPageFind::FindPrev() +FX_BOOL CPDF_TextPageFind::FindPrev() { if (!m_pTextPage) { - return false; + return FALSE; } m_resArray.RemoveAll(); if(m_strText.IsEmpty() || m_findPreStart < 0) { - m_IsFind = false; + m_IsFind = FALSE; return m_IsFind; } CPDF_TextPageFind findEngine(m_pTextPage); - bool ret = findEngine.FindFirst(m_findWhat, m_flags); + FX_BOOL ret = findEngine.FindFirst(m_findWhat, m_flags); if(!ret) { - m_IsFind = false; + m_IsFind = FALSE; return m_IsFind; } int order = -1, MatchedCount = 0; @@ -2321,12 +2321,12 @@ bool CPDF_TextPageFind::FindPrev() } } if(order == -1) { - m_IsFind = false; + m_IsFind = FALSE; return m_IsFind; } m_resStart = m_pTextPage->TextIndexFromCharIndex(order); m_resEnd = m_pTextPage->TextIndexFromCharIndex(order + MatchedCount - 1); - m_IsFind = true; + m_IsFind = TRUE; m_pTextPage->GetRectArray(order, MatchedCount, m_resArray); if(m_flags & FPDFTEXT_CONSECUTIVE) { m_findNextStart = m_resStart + 1; @@ -2385,16 +2385,16 @@ void CPDF_TextPageFind::ExtractFindWhat(const CFX_WideString& findwhat) index++; } } -bool CPDF_TextPageFind::IsMatchWholeWord(const CFX_WideString& csPageText, int startPos, int endPos) +FX_BOOL CPDF_TextPageFind::IsMatchWholeWord(const CFX_WideString& csPageText, int startPos, int endPos) { int char_left = 0; int char_right = 0; int char_count = endPos - startPos + 1; if(char_count < 1) { - return false; + return FALSE; } if (char_count == 1 && csPageText.GetAt(startPos) > 255) { - return true; + return TRUE; } if(startPos - 1 >= 0 ) { char_left = csPageText.GetAt(startPos - 1); @@ -2404,33 +2404,33 @@ bool CPDF_TextPageFind::IsMatchWholeWord(const CFX_WideString& csPageText, int s } if ((char_left > 'A' && char_left < 'a') || (char_left > 'a' && char_left < 'z') || (char_left > 0xfb00 && char_left < 0xfb06) || (char_left >= '0' && char_left <= '9') || (char_right > 'A' && char_right < 'a') || (char_right > 'a' && char_right < 'z') || (char_right > 0xfb00 && char_right < 0xfb06) || (char_right >= '0' && char_right <= '9')) { - return false; + return FALSE; } if(!(('A' > char_left || char_left > 'Z') && ('a' > char_left || char_left > 'z') && ('A' > char_right || char_right > 'Z') && ('a' > char_right || char_right > 'z'))) { - return false; + return FALSE; } if (char_count > 0) { if (csPageText.GetAt(startPos) >= L'0' && csPageText.GetAt(startPos) <= L'9' && char_left >= L'0' && char_left <= L'9') { - return false; + return FALSE; } if (csPageText.GetAt(endPos) >= L'0' && csPageText.GetAt(endPos) <= L'9' && char_right >= L'0' && char_right <= L'9') { - return false; + return FALSE; } } - return true; + return TRUE; } -bool CPDF_TextPageFind::ExtractSubString(CFX_WideString& rString, const FX_WCHAR* lpszFullString, +FX_BOOL CPDF_TextPageFind::ExtractSubString(CFX_WideString& rString, const FX_WCHAR* lpszFullString, int iSubString, FX_WCHAR chSep) { if (lpszFullString == NULL) { - return false; + return FALSE; } while (iSubString--) { lpszFullString = FXSYS_wcschr(lpszFullString, chSep); if (lpszFullString == NULL) { rString.Empty(); - return false; + return FALSE; } lpszFullString++; while(*lpszFullString == chSep) { @@ -2443,7 +2443,7 @@ bool CPDF_TextPageFind::ExtractSubString(CFX_WideString& rString, const FX_WCHAR ASSERT(nLen >= 0); FXSYS_memcpy(rString.GetBuffer(nLen), lpszFullString, nLen * sizeof(FX_WCHAR)); rString.ReleaseBuffer(); - return true; + return TRUE; } CFX_WideString CPDF_TextPageFind::MakeReverse(const CFX_WideString& str) { @@ -2471,27 +2471,27 @@ int CPDF_TextPageFind::GetMatchedCount()const } CPDF_LinkExtract::CPDF_LinkExtract() : m_pTextPage(NULL), - m_IsParserd(false) + m_IsParserd(FALSE) { } CPDF_LinkExtract::~CPDF_LinkExtract() { DeleteLinkList(); } -bool CPDF_LinkExtract::ExtractLinks(const IPDF_TextPage* pTextPage) +FX_BOOL CPDF_LinkExtract::ExtractLinks(const IPDF_TextPage* pTextPage) { if (!pTextPage || !pTextPage->IsParsered()) { - return false; + return FALSE; } m_pTextPage = (const CPDF_TextPage*)pTextPage; m_strPageText = m_pTextPage->GetPageText(0, -1); DeleteLinkList(); if (m_strPageText.IsEmpty()) { - return false; + return FALSE; } parserLink(); - m_IsParserd = true; - return true; + m_IsParserd = TRUE; + return TRUE; } void CPDF_LinkExtract::DeleteLinkList() { @@ -2546,42 +2546,42 @@ void CPDF_LinkExtract::parserLink() } } } -bool CPDF_LinkExtract::CheckWebLink(CFX_WideString& strBeCheck) +FX_BOOL CPDF_LinkExtract::CheckWebLink(CFX_WideString& strBeCheck) { CFX_WideString str = strBeCheck; str.MakeLower(); if (str.Find(L"http://www.") != -1) { strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"http://www.")); - return true; + return TRUE; } if (str.Find(L"http://") != -1) { strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"http://")); - return true; + return TRUE; } if (str.Find(L"https://www.") != -1) { strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"https://www.")); - return true; + return TRUE; } if (str.Find(L"https://") != -1) { strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"https://")); - return true; + return TRUE; } if (str.Find(L"www.") != -1) { strBeCheck = strBeCheck.Right(str.GetLength() - str.Find(L"www.")); strBeCheck = L"http://" + strBeCheck; - return true; + return TRUE; } - return false; + return FALSE; } -bool CPDF_LinkExtract::CheckMailLink(CFX_WideString& str) +FX_BOOL CPDF_LinkExtract::CheckMailLink(CFX_WideString& str) { str.MakeLower(); int aPos = str.Find(L'@'); if (aPos < 1) { - return false; + return FALSE; } if (str.GetAt(aPos - 1) == L'.' || str.GetAt(aPos - 1) == L'_') { - return false; + return FALSE; } int i; for (i = aPos - 1; i >= 0; i--) { @@ -2590,7 +2590,7 @@ bool CPDF_LinkExtract::CheckMailLink(CFX_WideString& str) continue; } else { if (i == aPos - 1) { - return false; + return FALSE; } str = str.Right(str.GetLength() - i - 1); break; @@ -2598,7 +2598,7 @@ bool CPDF_LinkExtract::CheckMailLink(CFX_WideString& str) } aPos = str.Find(L'@'); if (aPos < 1) { - return false; + return FALSE; } CFX_WideString strtemp = L""; for (i = 0; i < aPos; i++) { @@ -2614,13 +2614,13 @@ bool CPDF_LinkExtract::CheckMailLink(CFX_WideString& str) } aPos = str.Find(L'@'); if (aPos < 1) { - return false; + return FALSE; } str.TrimRight(L'.'); strtemp = str; int ePos = str.Find(L'.'); if (ePos == -1) { - return false; + return FALSE; } while (ePos != -1) { strtemp = strtemp.Right(strtemp.GetLength() - ePos - 1); @@ -2643,22 +2643,22 @@ bool CPDF_LinkExtract::CheckMailLink(CFX_WideString& str) if (wch == L'-' || wch == L'.' || (wch >= L'a' && wch <= L'z') || (wch >= L'0' && wch <= L'9')) { continue; } else { - return false; + return FALSE; } } if (str.Find(L"mailto:") == -1) { str = L"mailto:" + str; } - return true; + return TRUE; } -bool CPDF_LinkExtract::AppendToLinkList(int start, int count, const CFX_WideString& strUrl) +FX_BOOL CPDF_LinkExtract::AppendToLinkList(int start, int count, const CFX_WideString& strUrl) { CPDF_LinkExt* linkInfo = new CPDF_LinkExt; linkInfo->m_strUrl = strUrl; linkInfo->m_Start = start; linkInfo->m_Count = count; m_LinkList.Add(linkInfo); - return true; + return TRUE; } CFX_WideString CPDF_LinkExtract::GetURL(int index) const { diff --git a/core/src/fpdftext/fpdf_text_search.cpp b/core/src/fpdftext/fpdf_text_search.cpp index d88e9e1760..21a2564ae6 100644 --- a/core/src/fpdftext/fpdf_text_search.cpp +++ b/core/src/fpdftext/fpdf_text_search.cpp @@ -9,56 +9,56 @@ class CPDF_TextStream { public: - CPDF_TextStream(CFX_WideTextBuf& buffer, bool bUseLF, CFX_PtrArray* pObjArray); + CPDF_TextStream(CFX_WideTextBuf& buffer, FX_BOOL bUseLF, CFX_PtrArray* pObjArray); ~CPDF_TextStream() {} - bool ProcessObject(const CPDF_TextObject* pObj, bool bFirstLine); + FX_BOOL ProcessObject(const CPDF_TextObject* pObj, FX_BOOL bFirstLine); CFX_WideTextBuf& m_Buffer; - bool m_bUseLF; + FX_BOOL m_bUseLF; CFX_PtrArray* m_pObjArray; const CPDF_TextObject* m_pLastObj; }; -CPDF_TextStream::CPDF_TextStream(CFX_WideTextBuf& buffer, bool bUseLF, CFX_PtrArray* pObjArray) : m_Buffer(buffer) +CPDF_TextStream::CPDF_TextStream(CFX_WideTextBuf& buffer, FX_BOOL bUseLF, CFX_PtrArray* pObjArray) : m_Buffer(buffer) { m_pLastObj = NULL; m_bUseLF = bUseLF; m_pObjArray = pObjArray; } -bool FPDFText_IsSameTextObject(const CPDF_TextObject* pTextObj1, const CPDF_TextObject* pTextObj2) +FX_BOOL FPDFText_IsSameTextObject(const CPDF_TextObject* pTextObj1, const CPDF_TextObject* pTextObj2) { if (!pTextObj1 || !pTextObj2) { - return false; + return FALSE; } CFX_FloatRect rcPreObj(pTextObj2->m_Left, pTextObj2->m_Bottom, pTextObj2->m_Right, pTextObj2->m_Top); CFX_FloatRect rcCurObj(pTextObj1->m_Left, pTextObj1->m_Bottom, pTextObj1->m_Right, pTextObj1->m_Top); if (rcPreObj.IsEmpty() && rcCurObj.IsEmpty()) { - return true; + return TRUE; } if (!rcPreObj.IsEmpty() || !rcCurObj.IsEmpty()) { rcPreObj.Intersect(rcCurObj); if (rcPreObj.IsEmpty()) { - return false; + return FALSE; } if (FXSYS_fabs(rcPreObj.Width() - rcCurObj.Width()) > rcCurObj.Width() / 2) { - return false; + return FALSE; } if (pTextObj2->GetFontSize() != pTextObj1->GetFontSize()) { - return false; + return FALSE; } } int nPreCount = pTextObj2->CountItems(); int nCurCount = pTextObj1->CountItems(); if (nPreCount != nCurCount) { - return false; + return FALSE; } for (int i = 0; i < nPreCount; i++) { CPDF_TextObjectItem itemPer, itemCur; pTextObj2->GetItemInfo(i, &itemPer); pTextObj1->GetItemInfo(i, &itemCur); if (itemCur.m_CharCode != itemPer.m_CharCode) { - return false; + return FALSE; } } - return true; + return TRUE; } int GetCharWidth(FX_DWORD charCode, CPDF_Font* pFont) { @@ -133,7 +133,7 @@ int FPDFText_ProcessInterObj(const CPDF_TextObject* pPrevObj, const CPDF_TextObj } return 0; } -bool CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj, bool bFirstLine) +FX_BOOL CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj, FX_BOOL bFirstLine) { CPDF_Font* pFont = pObj->GetFont(); CFX_AffineMatrix matrix; @@ -150,7 +150,7 @@ bool CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj, bool bFirstLine } } else { if (bFirstLine) { - return true; + return TRUE; } if (m_bUseLF) { m_Buffer.AppendChar(L'\r'); @@ -176,7 +176,7 @@ bool CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj, bool bFirstLine } } else if (result == -1) { m_pLastObj = pObj; - return false; + return FALSE; } else if (result == 3) { item_index = 1; } @@ -277,9 +277,9 @@ bool CPDF_TextStream::ProcessObject(const CPDF_TextObject* pObj, bool bFirstLine } } } - return false; + return FALSE; } -void _PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, CPDF_PageObjects* pPage, bool bUseLF, +void _PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, CPDF_PageObjects* pPage, FX_BOOL bUseLF, CFX_PtrArray* pObjArray) { CPDF_TextStream textstream(buffer, bUseLF, pObjArray); @@ -292,7 +292,7 @@ void _PDF_GetTextStream_Unicode(CFX_WideTextBuf& buffer, CPDF_PageObjects* pPage if (pObject->m_Type != PDFPAGE_TEXT) { continue; } - textstream.ProcessObject((CPDF_TextObject*)pObject, false); + textstream.ProcessObject((CPDF_TextObject*)pObject, FALSE); } } CFX_WideString PDF_GetFirstTextLine_Unicode(CPDF_Document* pDoc, CPDF_Dictionary* pPage) @@ -302,17 +302,17 @@ CFX_WideString PDF_GetFirstTextLine_Unicode(CPDF_Document* pDoc, CPDF_Dictionary CPDF_Page page; page.Load(pDoc, pPage); CPDF_ParseOptions options; - options.m_bTextOnly = true; - options.m_bSeparateForm = false; + options.m_bTextOnly = TRUE; + options.m_bSeparateForm = FALSE; page.ParseContent(&options); - CPDF_TextStream textstream(buffer, false, NULL); + CPDF_TextStream textstream(buffer, FALSE, NULL); FX_POSITION pos = page.GetFirstObjectPosition(); while (pos) { CPDF_PageObject* pObject = page.GetNextObject(pos); if (pObject->m_Type != PDFPAGE_TEXT) { continue; } - if (textstream.ProcessObject((CPDF_TextObject*)pObject, true)) { + if (textstream.ProcessObject((CPDF_TextObject*)pObject, TRUE)) { break; } } diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h index bcacc57863..ce52371df0 100644 --- a/core/src/fpdftext/text_int.h +++ b/core/src/fpdftext/text_int.h @@ -48,9 +48,9 @@ public: CPDF_TextPage(const CPDF_Page* pPage, int flags = 0); CPDF_TextPage(const CPDF_PageObjects* pPage, int flags = 0); CPDF_TextPage(const CPDF_Page* pPage, CPDFText_ParseOptions ParserOptions); - virtual bool ParseTextPage(); - virtual void NormalizeObjects(bool bNormalize); - virtual bool IsParsered() const + virtual FX_BOOL ParseTextPage(); + virtual void NormalizeObjects(FX_BOOL bNormalize); + virtual FX_BOOL IsParsered() const { return m_IsParsered; } @@ -71,10 +71,10 @@ public: virtual int CountRects(int start, int nCount); virtual void GetRect(int rectIndex, FX_FLOAT& left, FX_FLOAT& top , FX_FLOAT& right, FX_FLOAT &bottom) const; - virtual bool GetBaselineRotate(int rectIndex, int& Rotate); - virtual bool GetBaselineRotate(const CFX_FloatRect& rect, int& Rotate); + virtual FX_BOOL GetBaselineRotate(int rectIndex, int& Rotate); + virtual FX_BOOL GetBaselineRotate(const CFX_FloatRect& rect, int& Rotate); virtual int CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, - FX_FLOAT right, FX_FLOAT bottom, bool bContains = false); + FX_FLOAT right, FX_FLOAT bottom, FX_BOOL bContains = FALSE); virtual void GetBoundedSegment(int index, int& start, int& count) const; virtual int GetWordBreak(int index, int direction) const; public: @@ -82,20 +82,20 @@ public: { return &m_charList; } - static bool IsRectIntersect(const CFX_FloatRect& rect1, const CFX_FloatRect& rect2); - static bool IsLetter(FX_WCHAR unicode); + static FX_BOOL IsRectIntersect(const CFX_FloatRect& rect1, const CFX_FloatRect& rect2); + static FX_BOOL IsLetter(FX_WCHAR unicode); private: - bool IsHyphen(FX_WCHAR curChar); + FX_BOOL IsHyphen(FX_WCHAR curChar); bool IsControlChar(const PAGECHAR_INFO& charInfo); - bool GetBaselineRotate(int start, int end, int& Rotate); + FX_BOOL GetBaselineRotate(int start, int end, int& Rotate); void ProcessObject(); void ProcessFormObject(CPDF_FormObject* pFormObj, const CFX_AffineMatrix& formMatrix); void ProcessTextObject(PDFTEXT_Obj pObj); void ProcessTextObject(CPDF_TextObject* pTextObj, const CFX_AffineMatrix& formMatrix, FX_POSITION ObjPos); int ProcessInsertObject(const CPDF_TextObject* pObj, const CFX_AffineMatrix& formMatrix); - bool GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info); - bool IsSameAsPreTextObject(CPDF_TextObject* pTextObj, FX_POSITION ObjPos); - bool IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject* pTextObj2); + FX_BOOL GenerateCharInfo(FX_WCHAR unicode, PAGECHAR_INFO& info); + FX_BOOL IsSameAsPreTextObject(CPDF_TextObject* pTextObj, FX_POSITION ObjPos); + FX_BOOL IsSameTextObject(CPDF_TextObject* pTextObj1, CPDF_TextObject* pTextObj2); int GetCharWidth(FX_DWORD charCode, CPDF_Font* pFont) const; void CloseTempLine(); void OnPiece(IFX_BidiChar* pBidi, CFX_WideString& str); @@ -109,7 +109,7 @@ private: int32_t FindTextlineFlowDirection(); void SwapTempTextBuf(int32_t iCharListStartAppend, int32_t iBufStartAppend); - bool IsRightToLeft(const CPDF_TextObject* pTextObj, + FX_BOOL IsRightToLeft(const CPDF_TextObject* pTextObj, const CPDF_Font* pFont, int nItems) const; protected: @@ -123,13 +123,13 @@ protected: int m_parserflag; CPDF_TextObject* m_pPreTextObj; CFX_AffineMatrix m_perMatrix; - bool m_IsParsered; + FX_BOOL m_IsParsered; CFX_AffineMatrix m_DisplayMatrix; SEGMENT_Array m_Segment; CFX_RectArray m_SelRects; LINEOBJ m_LineObj; - bool m_TextlineDir; + FX_BOOL m_TextlineDir; CFX_FloatRect m_CurlineRect; }; class CPDF_TextPageFind: public IPDF_TextPageFind @@ -138,17 +138,17 @@ public: CPDF_TextPageFind(const IPDF_TextPage* pTextPage); virtual ~CPDF_TextPageFind() {}; public: - virtual bool FindFirst(const CFX_WideString& findwhat, int flags, int startPos = 0); - virtual bool FindNext(); - virtual bool FindPrev(); + virtual FX_BOOL FindFirst(const CFX_WideString& findwhat, int flags, int startPos = 0); + virtual FX_BOOL FindNext(); + virtual FX_BOOL FindPrev(); virtual void GetRectArray(CFX_RectArray& rects) const; virtual int GetCurOrder() const; virtual int GetMatchedCount()const; protected: void ExtractFindWhat(const CFX_WideString& findwhat); - bool IsMatchWholeWord(const CFX_WideString& csPageText, int startPos, int endPos); - bool ExtractSubString(CFX_WideString& rString, const FX_WCHAR* lpszFullString, + FX_BOOL IsMatchWholeWord(const CFX_WideString& csPageText, int startPos, int endPos); + FX_BOOL ExtractSubString(CFX_WideString& rString, const FX_WCHAR* lpszFullString, int iSubString, FX_WCHAR chSep); CFX_WideString MakeReverse(const CFX_WideString& str); int ReverseFind(const CFX_WideString& csPageText, const CFX_WideString& csWord, int nStartPos, int& WordLength); @@ -162,12 +162,12 @@ private: CFX_WideStringArray m_csFindWhatArray; int m_findNextStart; int m_findPreStart; - bool m_bMatchCase; - bool m_bMatchWholeWord; + FX_BOOL m_bMatchCase; + FX_BOOL m_bMatchWholeWord; int m_resStart; int m_resEnd; CFX_RectArray m_resArray; - bool m_IsFind; + FX_BOOL m_IsFind; }; class CPDF_LinkExt { @@ -184,8 +184,8 @@ class CPDF_LinkExtract: public IPDF_LinkExtract public: CPDF_LinkExtract(); virtual ~CPDF_LinkExtract(); - virtual bool ExtractLinks(const IPDF_TextPage* pTextPage); - virtual bool IsExtract() const + virtual FX_BOOL ExtractLinks(const IPDF_TextPage* pTextPage); + virtual FX_BOOL IsExtract() const { return m_IsParserd; } @@ -197,14 +197,14 @@ public: protected: void parserLink(); void DeleteLinkList(); - bool CheckWebLink(CFX_WideString& strBeCheck); - bool CheckMailLink(CFX_WideString& str); - bool AppendToLinkList(int start, int count, const CFX_WideString& strUrl); + FX_BOOL CheckWebLink(CFX_WideString& strBeCheck); + FX_BOOL CheckMailLink(CFX_WideString& str); + FX_BOOL AppendToLinkList(int start, int count, const CFX_WideString& strUrl); private: LINK_InfoArray m_LinkList; const CPDF_TextPage* m_pTextPage; CFX_WideString m_strPageText; - bool m_IsParserd; + FX_BOOL m_IsParserd; }; FX_STRSIZE FX_Unicode_GetNormalization(FX_WCHAR wch, FX_WCHAR* pDst); void NormalizeString(CFX_WideString& str); diff --git a/core/src/fpdftext/txtproc.h b/core/src/fpdftext/txtproc.h index efe9ff9082..275aabd53b 100644 --- a/core/src/fpdftext/txtproc.h +++ b/core/src/fpdftext/txtproc.h @@ -33,8 +33,8 @@ public: ~CTextBaseLine(); void InsertTextBox(FX_FLOAT leftx, FX_FLOAT rightx, FX_FLOAT topy, FX_FLOAT bottomy, FX_FLOAT spacew, FX_FLOAT fontsize_v, const CFX_WideString& str); - bool GetWidth(FX_FLOAT& leftx, FX_FLOAT& rightx); - bool CanMerge(CTextBaseLine* pOther); + FX_BOOL GetWidth(FX_FLOAT& leftx, FX_FLOAT& rightx); + FX_BOOL CanMerge(CTextBaseLine* pOther); void Merge(CTextBaseLine* pOther); void MergeBoxes(); void CountChars(int& count, FX_FLOAT& width, int& minchars); @@ -57,9 +57,9 @@ public: FX_FLOAT rightx, FX_FLOAT topy, FX_FLOAT bottomy, FX_FLOAT spacew, FX_FLOAT fontsize_v, CFX_ByteString& str, CPDF_Font* pFont); void WriteOutput(CFX_WideStringArray& lines, int iMinWidth); - bool m_bAutoWidth; - bool m_bKeepColumn; - bool m_bBreakSpace; + FX_BOOL m_bAutoWidth; + FX_BOOL m_bKeepColumn; + FX_BOOL m_bBreakSpace; private: CFX_PtrArray m_BaseLines; -- cgit v1.2.3