From 4bb4029b1523aa1dbd328fee6ac66385c5fa5b48 Mon Sep 17 00:00:00 2001 From: Nicolas Pena Date: Thu, 6 Apr 2017 14:28:21 -0400 Subject: Use CFX_MaybeOwned on the buffer of CFX_DIBitmap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia4181a2838de60e4e177165b3689338c86f45771 Reviewed-on: https://pdfium-review.googlesource.com/3817 Reviewed-by: Tom Sepez Commit-Queue: Nicolás Peña --- core/fxge/dib/cfx_dibitmap.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'core/fxge/dib/cfx_dibitmap.h') diff --git a/core/fxge/dib/cfx_dibitmap.h b/core/fxge/dib/cfx_dibitmap.h index 9cb46afb53..87688a1ade 100644 --- a/core/fxge/dib/cfx_dibitmap.h +++ b/core/fxge/dib/cfx_dibitmap.h @@ -7,6 +7,7 @@ #ifndef CORE_FXGE_DIB_CFX_DIBITMAP_H_ #define CORE_FXGE_DIB_CFX_DIBITMAP_H_ +#include "core/fxcrt/cfx_maybe_owned.h" #include "core/fxcrt/cfx_retain_ptr.h" #include "core/fxcrt/fx_basic.h" #include "core/fxcrt/fx_coordinates.h" @@ -119,17 +120,16 @@ class CFX_DIBitmap : public CFX_DIBSource { protected: CFX_DIBitmap(); CFX_DIBitmap(const CFX_DIBitmap& src); - bool GetGrayData(void* pIccTransform = nullptr); + bool GetGrayData(void* pIccTransform = nullptr); #if defined _SKIA_SUPPORT_PATHS_ enum class Format { kCleared, kPreMultiplied, kUnPreMultiplied }; #endif - uint8_t* m_pBuffer; + CFX_MaybeOwned m_pBuffer; #if defined _SKIA_SUPPORT_PATHS_ Format m_nFormat; #endif - bool m_bExtBuf; }; #endif // CORE_FXGE_DIB_CFX_DIBITMAP_H_ -- cgit v1.2.3