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 /public | |
| 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 'public')
| -rw-r--r-- | public/fpdf_sysfontinfo.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/public/fpdf_sysfontinfo.h b/public/fpdf_sysfontinfo.h index dbadb89afe..61465f4262 100644 --- a/public/fpdf_sysfontinfo.h +++ b/public/fpdf_sysfontinfo.h @@ -94,13 +94,13 @@ typedef struct _FPDF_SYSFONTINFO { * charset - Character set identifier for the requested font. See above defined constants. * pitch_family - A combination of flags. See above defined constants. * face - Typeface name. Currently use system local encoding only. - * bExact - Pointer to an boolean value receiving the indicator whether mapper found the exact match. + * bExact - Pointer to a boolean value receiving the indicator whether mapper found the exact match. * If mapper is not sure whether it's exact match, ignore this paramter. * Return Value: * An opaque pointer for font handle, or NULL if system mapping is not supported. **/ - void* (*MapFont)(struct _FPDF_SYSFONTINFO* pThis, int weight, int bItalic, int charset, int pitch_family, - const char* face, int* bExact); + void* (*MapFont)(struct _FPDF_SYSFONTINFO* pThis, int weight, FPDF_BOOL bItalic, int charset, int pitch_family, + const char* face, FPDF_BOOL* bExact); /** * Method: GetFont |