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/fxcodec/codec/codec_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/fxcodec/codec/codec_int.h')
| -rw-r--r-- | core/src/fxcodec/codec/codec_int.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/fxcodec/codec/codec_int.h b/core/src/fxcodec/codec/codec_int.h index 244793b634..a1445a5003 100644 --- a/core/src/fxcodec/codec/codec_int.h +++ b/core/src/fxcodec/codec/codec_int.h @@ -152,7 +152,7 @@ public: virtual void Finish(void* pContext); virtual void Input(void* pContext, const uint8_t* src_buf, FX_DWORD src_size); virtual int ReadHeader(void* pContext, int* width, int* height, int* nComps, CFX_DIBAttribute* pAttribute = NULL); - virtual FX_BOOL StartScanline(void* pContext, int down_scale); + virtual int StartScanline(void* pContext, int down_scale); virtual FX_BOOL ReadScanline(void* pContext, uint8_t* dest_buf); virtual FX_DWORD GetAvailInput(void* pContext, uint8_t** avail_buf_ptr); protected: |