From e6ff2ebfaa19421c8d932f4d275548156ae2e13c Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 24 Aug 2018 21:55:46 +0000 Subject: Rename CFX_DIBSource to CFX_DIBBase. It is not a source from which you can get CFX_DIBs, but rather a base class from which all DIBs inherit. Do the same thing for the CPDF_DIBSource wrapper class. Mechanical change apart from adding a one-line comment in cfx_dibbase.h Change-Id: Id2bde87813ca301d9fafc55ce08d703dfc6a7184 Reviewed-on: https://pdfium-review.googlesource.com/41352 Reviewed-by: Lei Zhang Commit-Queue: Tom Sepez --- core/fxcodec/codec/ccodec_jpegmodule.h | 4 ++-- core/fxcodec/codec/fx_codec_jpeg.cpp | 4 ++-- core/fxcodec/fx_codec.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'core/fxcodec') diff --git a/core/fxcodec/codec/ccodec_jpegmodule.h b/core/fxcodec/codec/ccodec_jpegmodule.h index 06cd2242c2..d990ee938f 100644 --- a/core/fxcodec/codec/ccodec_jpegmodule.h +++ b/core/fxcodec/codec/ccodec_jpegmodule.h @@ -14,7 +14,7 @@ #include "core/fxcrt/retain_ptr.h" class CCodec_ScanlineDecoder; -class CFX_DIBSource; +class CFX_DIBBase; #ifdef PDF_ENABLE_XFA class CFX_DIBAttribute; @@ -58,7 +58,7 @@ class CCodec_JpegModule { uint32_t GetAvailInput(Context* pContext, uint8_t** avail_buf_ptr); #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ - static bool JpegEncode(const RetainPtr& pSource, + static bool JpegEncode(const RetainPtr& pSource, uint8_t** dest_buf, size_t* dest_size); #endif // _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp index f0b8d66d3a..4c37465386 100644 --- a/core/fxcodec/codec/fx_codec_jpeg.cpp +++ b/core/fxcodec/codec/fx_codec_jpeg.cpp @@ -13,7 +13,7 @@ #include "core/fxcodec/codec/ccodec_scanlinedecoder.h" #include "core/fxcodec/fx_codec.h" #include "core/fxcrt/fx_safe_types.h" -#include "core/fxge/dib/cfx_dibsource.h" +#include "core/fxge/dib/cfx_dibbase.h" #include "core/fxge/fx_dib.h" #include "third_party/base/logging.h" #include "third_party/base/ptr_util.h" @@ -493,7 +493,7 @@ uint32_t CCodec_JpegModule::GetAvailInput(Context* pContext, #if _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_ #define JPEG_BLOCK_SIZE 1048576 -bool CCodec_JpegModule::JpegEncode(const RetainPtr& pSource, +bool CCodec_JpegModule::JpegEncode(const RetainPtr& pSource, uint8_t** dest_buf, size_t* dest_size) { struct jpeg_error_mgr jerr; diff --git a/core/fxcodec/fx_codec.h b/core/fxcodec/fx_codec.h index 1eaf846fd7..0a0c08afc3 100644 --- a/core/fxcodec/fx_codec.h +++ b/core/fxcodec/fx_codec.h @@ -43,7 +43,7 @@ class CCodec_IccModule; class CCodec_Jbig2Module; class CCodec_JpegModule; class CCodec_JpxModule; -class CFX_DIBSource; +class CFX_DIBBase; class CJPX_Decoder; class CPDF_ColorSpace; class CPDF_StreamAcc; -- cgit v1.2.3