diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-07-27 14:49:43 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-07-27 14:49:43 -0700 |
| commit | 93253e8d623cd3e0751ea45df1e414be1495335e (patch) | |
| tree | db789182a2d8f0b1c5d384576b2129c2846dba32 /core/src/fpdftext | |
| parent | 2c3d8060505f382477dde7e79618480d774f19c3 (diff) | |
| download | pdfium-93253e8d623cd3e0751ea45df1e414be1495335e.tar.xz | |
Merge to XFA: Fix FX_BOOL compilation errors under windows
(cherry picked from commit a25b4bca69ab26d174edb8cefbdcfc1a0353915a)
Original Review URL: https://codereview.chromium.org/1254973004 .
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1252943010 .
Diffstat (limited to 'core/src/fpdftext')
| -rw-r--r-- | core/src/fpdftext/fpdf_text_int.cpp | 2 | ||||
| -rw-r--r-- | core/src/fpdftext/text_int.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/src/fpdftext/fpdf_text_int.cpp b/core/src/fpdftext/fpdf_text_int.cpp index 8bcf996465..8c31018c71 100644 --- a/core/src/fpdftext/fpdf_text_int.cpp +++ b/core/src/fpdftext/fpdf_text_int.cpp @@ -715,7 +715,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 0acb688f6f..eb50a1b4a1 100644 --- a/core/src/fpdftext/text_int.h +++ b/core/src/fpdftext/text_int.h @@ -124,7 +124,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 |