core/include/fpdfapi/fpdf_render.h - Issue 1252613002: FX_BOOL considered harmful.

Unified Diff: core/include/fpdfapi/fpdf_render.h

Issue 1252613002: FX_BOOL considered harmful. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: Manual edits. Created 5 years, 5 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

Index: core/include/fpdfapi/fpdf_render.h

diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h

index f3590095ad517b1b6d7f7e06a2739ff4f9225340..37e8a540c17e193c9ab836b4fd8ca0a289d3507b 100644

--- a/core/include/fpdfapi/fpdf_render.h

+++ b/core/include/fpdfapi/fpdf_render.h

@@ -33,9 +33,9 @@ public:

virtual ~IPDF_OCContext() {}

- virtual FX_BOOL CheckOCGVisible(const CPDF_Dictionary* pOCG) = 0;

+ virtual bool CheckOCGVisible(const CPDF_Dictionary* pOCG) = 0;

- FX_BOOL CheckObjectVisible(const CPDF_PageObject* pObj);

+ bool CheckObjectVisible(const CPDF_PageObject* pObj);

};

#define RENDER_COLOR_NORMAL 0

#define RENDER_COLOR_GRAY 1

@@ -89,10 +89,10 @@ public:

CPDF_RenderContext();

- void Create(CPDF_Page* pPage, FX_BOOL bFirstLayer = TRUE);

+ void Create(CPDF_Page* pPage, bool bFirstLayer = true);

void Create(CPDF_Document* pDoc = NULL, CPDF_PageRenderCache* pPageCache = NULL,

- CPDF_Dictionary* pPageResources = NULL, FX_BOOL bFirstLayer = TRUE);

+ CPDF_Dictionary* pPageResources = NULL, bool bFirstLayer = true);

~CPDF_RenderContext();

@@ -126,7 +126,7 @@ protected:

CFX_ArrayTemplate<struct _PDF_RenderItem> m_ContentList;

- FX_BOOL m_bFirstLayer;

+ bool m_bFirstLayer;

void Render(CFX_RenderDevice* pDevice, const CPDF_PageObject* pStopObj,

const CPDF_RenderOptions* pOptions, const CFX_AffineMatrix* pFinalMatrix);

@@ -192,17 +192,17 @@ public:

const CPDF_RenderOptions* pOptions = NULL

);

- static FX_BOOL DrawTextPath(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,

+ static bool DrawTextPath(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,

CPDF_Font* pFont, FX_FLOAT font_size,

const CFX_AffineMatrix* pText2User, const CFX_AffineMatrix* pUser2Device,

const CFX_GraphStateData* pGraphState,

FX_ARGB fill_argb, FX_ARGB stroke_argb, CFX_PathData* pClippingPath, int nFlag = 0);

- static FX_BOOL DrawNormalText(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,

+ static bool DrawNormalText(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,

CPDF_Font* pFont, FX_FLOAT font_size, const CFX_AffineMatrix* pText2Device,

FX_ARGB fill_argb, const CPDF_RenderOptions* pOptions);

- static FX_BOOL DrawType3Text(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,

+ static bool DrawType3Text(CFX_RenderDevice* pDevice, int nChars, FX_DWORD* pCharCodes, FX_FLOAT* pCharPos,

CPDF_Font* pFont, FX_FLOAT font_size, const CFX_AffineMatrix* pText2Device,

FX_ARGB fill_argb);

};

@@ -215,7 +215,7 @@ public:

m_nTimeCount = 0;

m_nCacheSize = 0;

m_pCurImageCache = NULL;

- m_bCurFindCache = FALSE;

+ m_bCurFindCache = false;

m_pCurImageCaches = NULL;

}

~CPDF_PageRenderCache()

@@ -238,7 +238,7 @@ public:

}

void GetCachedBitmap(CPDF_Stream* pStream, CFX_DIBSource*& pBitmap, CFX_DIBSource*& pMask, FX_DWORD& MatteColor,

- FX_BOOL bStdCS = FALSE, FX_DWORD GroupFamily = 0, FX_BOOL bLoadMask = FALSE,

+ bool bStdCS = false, FX_DWORD GroupFamily = 0, bool bLoadMask = false,

CPDF_RenderStatus* pRenderStatus = NULL, int32_t downsampleWidth = 0, int32_t downsampleHeight = 0);

void ResetBitmap(CPDF_Stream* pStream, const CFX_DIBitmap* pBitmap);

@@ -249,11 +249,11 @@ public:

}

CFX_MapPtrToPtr m_ImageCaches;

public:

- FX_BOOL StartGetCachedBitmap(CPDF_Stream* pStream, FX_BOOL bStdCS = FALSE, FX_DWORD GroupFamily = 0,

- FX_BOOL bLoadMask = FALSE, CPDF_RenderStatus* pRenderStatus = NULL,

+ bool StartGetCachedBitmap(CPDF_Stream* pStream, bool bStdCS = false, FX_DWORD GroupFamily = 0,

+ bool bLoadMask = false, CPDF_RenderStatus* pRenderStatus = NULL,

int32_t downsampleWidth = 0, int32_t downsampleHeight = 0);

- FX_BOOL Continue(IFX_Pause* pPause);

+ bool Continue(IFX_Pause* pPause);

CPDF_ImageCache* m_pCurImageCache;

CFX_PtrArray* m_pCurImageCaches;

protected:

@@ -262,7 +262,7 @@ protected:

FX_DWORD m_nTimeCount;

FX_DWORD m_nCacheSize;

- FX_BOOL m_bCurFindCache;

+ bool m_bCurFindCache;

};

class CPDF_RenderConfig

{

« no previous file with comments | « core/include/fpdfapi/fpdf_parser.h ('k') | core/include/fpdfapi/fpdf_resource.h » ('j') | no next file with comments »