Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2173)

Unified Diff: core/fpdfapi/fpdf_page/include/cpdf_image.h

Issue 2194393002: Fix a leak with FPDFPageObj_NewImgeObj(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: fix Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: core/fpdfapi/fpdf_page/include/cpdf_image.h
diff --git a/core/fpdfapi/fpdf_page/include/cpdf_image.h b/core/fpdfapi/fpdf_page/include/cpdf_image.h
index f475e534781f76d5e2d41128758d18f90bf28e8c..2a78bb00a3d09c0382d91eb87d1dedfcb783ac13 100644
--- a/core/fpdfapi/fpdf_page/include/cpdf_image.h
+++ b/core/fpdfapi/fpdf_page/include/cpdf_image.h
@@ -30,8 +30,7 @@ class CPDF_Image {
explicit CPDF_Image(CPDF_Document* pDoc);
~CPDF_Image();
- FX_BOOL LoadImageF(CPDF_Stream* pImageStream, FX_BOOL bInline);
-
+ bool CanRelease() const;
void Release();
Wei Li 2016/08/04 18:00:39 Nit: Release() can be removed. Callers can directl
CPDF_Image* Clone();
@@ -47,9 +46,11 @@ class CPDF_Image {
int32_t GetPixelHeight() const { return m_Height; }
int32_t GetPixelWidth() const { return m_Width; }
- FX_BOOL IsInline() { return m_bInline; }
- FX_BOOL IsMask() const { return m_bIsMask; }
- FX_BOOL IsInterpol() const { return m_bInterpolate; }
+ bool IsInline() const { return m_bInline; }
+ bool IsMask() const { return m_bIsMask; }
+ bool IsInterpol() const { return m_bInterpolate; }
+
+ void LoadImageF(CPDF_Stream* pImageStream, bool bInline);
CFX_DIBSource* LoadDIBSource(CFX_DIBSource** ppMask = nullptr,
uint32_t* pMatteColor = nullptr,
@@ -81,13 +82,13 @@ class CPDF_Image {
CPDF_Dictionary* InitJPEG(uint8_t* pData, uint32_t size);
CPDF_Stream* m_pStream;
- FX_BOOL m_bInline;
+ bool m_bInline;
CPDF_Dictionary* m_pInlineDict;
int32_t m_Height;
int32_t m_Width;
- FX_BOOL m_bIsMask;
- FX_BOOL m_bInterpolate;
- CPDF_Document* m_pDocument;
+ bool m_bIsMask;
+ bool m_bInterpolate;
+ CPDF_Document* const m_pDocument;
CPDF_Dictionary* m_pOC;
};

Powered by Google App Engine
This is Rietveld 408576698