From a25b4bca69ab26d174edb8cefbdcfc1a0353915a Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Mon, 27 Jul 2015 14:38:43 -0700 Subject: Fix FX_BOOL compilation errors under windows - Bool functions should not return -1 for error. - Bool variables should not be assigned 2 - Bool / int32_t prototypes should match. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1254973004 . --- core/src/fpdftext/fpdf_text_int.cpp | 2 +- core/src/fpdftext/text_int.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fpdftext') diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index c1aaad8b5c..0e9c5ba0f4 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -712,7 +712,7 @@ int CPDF_TextPage::CountBoundedSegments(FX_FLOAT left, FX_FLOAT top, FX_FLOAT ri FPDF_SEGMENT segment; segment.m_Start = 0; segment.m_nCount = 0; - FX_BOOL segmentStatus = 0; + int segmentStatus = 0; FX_BOOL IsContainPreChar = FALSE; while (pos < nCount) { PAGECHAR_INFO charinfo = *(PAGECHAR_INFO*)m_charList.GetAt(pos); diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h index ce52371df0..7f15be1b0a 100644 --- a/core/src/fpdftext/text_int.h +++ b/core/src/fpdftext/text_int.h @@ -129,7 +129,7 @@ protected: SEGMENT_Array m_Segment; CFX_RectArray m_SelRects; LINEOBJ m_LineObj; - FX_BOOL m_TextlineDir; + int32_t m_TextlineDir; CFX_FloatRect m_CurlineRect; }; class CPDF_TextPageFind: public IPDF_TextPageFind -- cgit v1.2.3