From 1f3442ce5c035d22e2cc9fffc203892f2f749373 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 23 Jul 2015 16:07:32 -0700 Subject: 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 . --- core/src/fxcodec/codec/fx_codec_jpeg.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'core/src/fxcodec/codec/fx_codec_jpeg.cpp') diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp index e8e075e6b0..62963643cf 100644 --- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp @@ -715,14 +715,14 @@ int CCodec_JpegModule::ReadHeader(void* pContext, int* width, int* height, int* _JpegLoadAttribute(&p->m_Info, pAttribute); return 0; } -FX_BOOL CCodec_JpegModule::StartScanline(void* pContext, int down_scale) +int CCodec_JpegModule::StartScanline(void* pContext, int down_scale) { if (m_pExtProvider) { return m_pExtProvider->StartScanline(pContext, down_scale); } FXJPEG_Context* p = (FXJPEG_Context*)pContext; if (setjmp(p->m_JumpMark) == -1) { - return FALSE; + return 0; } p->m_Info.scale_denom = down_scale; return jpeg_start_decompress(&p->m_Info); -- cgit v1.2.3