diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-07-23 16:07:32 -0700 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-07-23 16:07:32 -0700 |
commit | 1f3442ce5c035d22e2cc9fffc203892f2f749373 (patch) | |
tree | 7c66063cf1e29cc48c81ca84e9d766a2e23f4b95 /core/src/fxge/ge/text_int.h | |
parent | 2f2ffece124e4ed4b96d2846263015d4b5ad6c00 (diff) | |
download | pdfium-1f3442ce5c035d22e2cc9fffc203892f2f749373.tar.xz |
Merge to XFA: FX_BOOL combo patch.
Original Review URL: https://codereview.chromium.org/1257503002
Original Review URL: https://codereview.chromium.org/1253603002
Manual merge for:
core/include/fxge/fx_font.h
core/src/fxcodec/codec/codec_int.h
fpdfsdk/src/javascript/PublicMethods.cpp
R=thestig@chromium.org
Review URL: https://codereview.chromium.org/1248153004 .
Diffstat (limited to 'core/src/fxge/ge/text_int.h')
-rw-r--r-- | core/src/fxge/ge/text_int.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fxge/ge/text_int.h b/core/src/fxge/ge/text_int.h index 6f89868cb1..29d9e1cc4d 100644 --- a/core/src/fxge/ge/text_int.h +++ b/core/src/fxge/ge/text_int.h @@ -32,7 +32,7 @@ public: m_RefCount = 0; } ~CTTFontDesc(); - FX_BOOL ReleaseFace(FXFT_Face face); + int32_t ReleaseFace(FXFT_Face face); int m_Type; union { struct { |