core/src/fpdfapi/fpdf_render/fpdf_render.cpp - Issue 1255693002: Revert "FX_BOOL considered harmful, part 2."

Unified Diff: core/src/fpdfapi/fpdf_render/fpdf_render.cpp

Issue 1255693002: Revert "FX_BOOL considered harmful, part 2." (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master

Patch Set: 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

Download patch

Index: core/src/fpdfapi/fpdf_render/fpdf_render.cpp

diff --git a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp

index a70f5bfdf9283b869860683b2c298f51136446d9..f8b59913e474f169e8585e667370ad75fd9f9dc5 100644

--- a/core/src/fpdfapi/fpdf_render/fpdf_render.cpp

+++ b/core/src/fpdfapi/fpdf_render/fpdf_render.cpp

@@ -18,10 +18,10 @@ CPDF_DocRenderData::CPDF_DocRenderData(CPDF_Document* pPDFDoc)

CPDF_DocRenderData::~CPDF_DocRenderData()

{

- Clear(true);

+ Clear(TRUE);

}

-void CPDF_DocRenderData::Clear(bool bRelease)

+void CPDF_DocRenderData::Clear(FX_BOOL bRelease)

{

for (auto it = m_Type3FaceMap.begin(); it != m_Type3FaceMap.end();) {

auto curr_it = it++;

@@ -48,7 +48,7 @@ void CPDF_DocRenderData::Clear(bool bRelease)

delete m_pFontCache;

m_pFontCache = NULL;

} else {

- m_pFontCache->FreeCache(false);

+ m_pFontCache->FreeCache(FALSE);

}

@@ -118,7 +118,7 @@ void CPDF_RenderModule::DestroyDocData(CPDF_DocRenderData* pDocData)

void CPDF_RenderModule::ClearDocData(CPDF_DocRenderData* p)

{

if (p) {

- p->Clear(false);

+ p->Clear(FALSE);

}

void CPDF_RenderModule::DestroyPageCache(CPDF_PageRenderCache* pCache)

@@ -180,19 +180,19 @@ int CPDF_RenderStatus::s_CurrentRecursionDepth = 0;

CPDF_RenderStatus::CPDF_RenderStatus()

{

m_pContext = NULL;

- m_bStopped = false;

+ m_bStopped = FALSE;

m_pDevice = NULL;

m_pCurObj = NULL;

m_pStopObj = NULL;

m_HalftoneLimit = 0;

m_pObjectRenderer = NULL;

- m_bPrint = false;

+ m_bPrint = FALSE;

m_Transparency = 0;

m_DitherBits = 0;

- m_bDropObjects = false;

- m_bStdCS = false;

+ m_bDropObjects = FALSE;

+ m_bStdCS = FALSE;

m_GroupFamily = 0;

- m_bLoadMask = false;

+ m_bLoadMask = FALSE;

m_pType3Char = NULL;

m_T3FillColor = 0;

m_pFormResource = NULL;

@@ -205,13 +205,13 @@ CPDF_RenderStatus::~CPDF_RenderStatus()

delete m_pObjectRenderer;

}

-bool CPDF_RenderStatus::Initialize(CPDF_RenderContext* pContext, CFX_RenderDevice* pDevice,

+FX_BOOL CPDF_RenderStatus::Initialize(CPDF_RenderContext* pContext, CFX_RenderDevice* pDevice,

const CFX_AffineMatrix* pDeviceMatrix, const CPDF_PageObject* pStopObj,

const CPDF_RenderStatus* pParentState, const CPDF_GraphicStates* pInitialStates,

- const CPDF_RenderOptions* pOptions, int transparency, bool bDropObjects,

- CPDF_Dictionary* pFormResource, bool bStdCS, CPDF_Type3Char* pType3Char,

+ const CPDF_RenderOptions* pOptions, int transparency, FX_BOOL bDropObjects,

+ CPDF_Dictionary* pFormResource, FX_BOOL bStdCS, CPDF_Type3Char* pType3Char,

FX_ARGB fill_color, FX_DWORD GroupFamily,

- bool bLoadMask)

+ FX_BOOL bLoadMask)

{

m_pContext = pContext;

m_pDevice = pDevice;

@@ -253,7 +253,7 @@ bool CPDF_RenderStatus::Initialize(CPDF_RenderContext* pContext, CFX_RenderDevic

}

m_pObjectRenderer = NULL;

m_Transparency = transparency;

- return true;

+ return TRUE;

}

void CPDF_RenderStatus::RenderObjectList(const CPDF_PageObjects* pObjs, const CFX_AffineMatrix* pObj2Device)

{

@@ -267,7 +267,7 @@ void CPDF_RenderStatus::RenderObjectList(const CPDF_PageObjects* pObjs, const CF

index ++;

CPDF_PageObject* pCurObj = pObjs->GetNextObject(pos);

if (pCurObj == m_pStopObj) {

- m_bStopped = true;

+ m_bStopped = TRUE;

return;

}

if (!pCurObj) {

@@ -301,42 +301,42 @@ void CPDF_RenderStatus::RenderSingleObject(const CPDF_PageObject* pObj, const CF

}

ProcessObjectNoClip(pObj, pObj2Device);

}

-bool CPDF_RenderStatus::ContinueSingleObject(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device, IFX_Pause* pPause)

+FX_BOOL CPDF_RenderStatus::ContinueSingleObject(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device, IFX_Pause* pPause)

{

if (m_pObjectRenderer) {

if (m_pObjectRenderer->Continue(pPause)) {

- return true;

+ return TRUE;

}

if (!m_pObjectRenderer->m_Result) {

DrawObjWithBackground(pObj, pObj2Device);

}

delete m_pObjectRenderer;

m_pObjectRenderer = NULL;

- return false;

+ return FALSE;

}

m_pCurObj = pObj;

if (m_Options.m_pOCContext && pObj->m_ContentMark.NotNull())

if (!m_Options.m_pOCContext->CheckObjectVisible(pObj)) {

- return false;

+ return FALSE;

}

ProcessClipPath(pObj->m_ClipPath, pObj2Device);

if (ProcessTransparency(pObj, pObj2Device)) {

- return false;

+ return FALSE;

}

if (pObj->m_Type == PDFPAGE_IMAGE) {

m_pObjectRenderer = IPDF_ObjectRenderer::Create(pObj->m_Type);

- if (!m_pObjectRenderer->Start(this, pObj, pObj2Device, false)) {

+ if (!m_pObjectRenderer->Start(this, pObj, pObj2Device, FALSE)) {

if (!m_pObjectRenderer->m_Result) {

DrawObjWithBackground(pObj, pObj2Device);

}

delete m_pObjectRenderer;

m_pObjectRenderer = NULL;

- return false;

+ return FALSE;

}

return ContinueSingleObject(pObj, pObj2Device, pPause);

}

ProcessObjectNoClip(pObj, pObj2Device);

- return false;

+ return FALSE;

}

IPDF_ObjectRenderer* IPDF_ObjectRenderer::Create(int type)

{

@@ -345,7 +345,7 @@ IPDF_ObjectRenderer* IPDF_ObjectRenderer::Create(int type)

}

return new CPDF_ImageRenderer;

}

-bool CPDF_RenderStatus::GetObjectClippedRect(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device, bool bLogical, FX_RECT &rect) const

+FX_BOOL CPDF_RenderStatus::GetObjectClippedRect(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device, FX_BOOL bLogical, FX_RECT &rect) const

{

rect = pObj->GetBBox(pObj2Device);

FX_RECT rtClip = m_pDevice->GetClipBox();

@@ -370,7 +370,7 @@ void CPDF_RenderStatus::DitherObjectArea(const CPDF_PageObject* pObj, const CFX_

return;

}

FX_RECT rect;

- if (GetObjectClippedRect(pObj, pObj2Device, false, rect)) {

+ if (GetObjectClippedRect(pObj, pObj2Device, FALSE, rect)) {

return;

}

if (m_DitherBits == 2) {

@@ -386,7 +386,7 @@ void CPDF_RenderStatus::DitherObjectArea(const CPDF_PageObject* pObj, const CFX_

}

void CPDF_RenderStatus::ProcessObjectNoClip(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device)

{

- bool bRet = false;

+ FX_BOOL bRet = FALSE;

switch (pObj->m_Type) {

case PDFPAGE_TEXT:

bRet = ProcessText((CPDF_TextObject*)pObj, pObj2Device, NULL);

@@ -408,9 +408,9 @@ void CPDF_RenderStatus::ProcessObjectNoClip(const CPDF_PageObject* pObj, const C

DrawObjWithBackground(pObj, pObj2Device);

}

-bool CPDF_RenderStatus::DrawObjWithBlend(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device)

+FX_BOOL CPDF_RenderStatus::DrawObjWithBlend(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device)

{

- bool bRet = false;

+ FX_BOOL bRet = FALSE;

switch (pObj->m_Type) {

case PDFPAGE_PATH:

bRet = ProcessPath((CPDF_PathObject*)pObj, pObj2Device);

@@ -433,7 +433,7 @@ void CPDF_RenderStatus::GetScaledMatrix(CFX_Matrix &matrix) const

void CPDF_RenderStatus::DrawObjWithBackground(const CPDF_PageObject* pObj, const CFX_AffineMatrix* pObj2Device)

{

FX_RECT rect;

- if (GetObjectClippedRect(pObj, pObj2Device, false, rect)) {

+ if (GetObjectClippedRect(pObj, pObj2Device, FALSE, rect)) {

return;

}

int res = 300;

@@ -459,11 +459,11 @@ void CPDF_RenderStatus::DrawObjWithBackground(const CPDF_PageObject* pObj, const

status.RenderSingleObject(pObj, &matrix);

buffer.OutputToDevice();

}

-bool CPDF_RenderStatus::ProcessForm(CPDF_FormObject* pFormObj, const CFX_AffineMatrix* pObj2Device)

+FX_BOOL CPDF_RenderStatus::ProcessForm(CPDF_FormObject* pFormObj, const CFX_AffineMatrix* pObj2Device)

{

CPDF_Dictionary* pOC = pFormObj->m_pForm->m_pFormDict->GetDict(FX_BSTRC("OC"));

if (pOC && m_Options.m_pOCContext && !m_Options.m_pOCContext->CheckOCGVisible(pOC)) {

- return true;

+ return TRUE;

}

CFX_AffineMatrix matrix = pFormObj->m_FormMatrix;

matrix.Concat(*pObj2Device);

@@ -473,15 +473,15 @@ bool CPDF_RenderStatus::ProcessForm(CPDF_FormObject* pFormObj, const CFX_AffineM

}

CPDF_RenderStatus status;

status.Initialize(m_pContext, m_pDevice, NULL, m_pStopObj,

- this, pFormObj, &m_Options, m_Transparency, m_bDropObjects, pResources, false);

+ this, pFormObj, &m_Options, m_Transparency, m_bDropObjects, pResources, FALSE);

status.m_curBlend = m_curBlend;

m_pDevice->SaveState();

status.RenderObjectList(pFormObj->m_pForm, &matrix);

m_bStopped = status.m_bStopped;

m_pDevice->RestoreState();

- return true;

+ return TRUE;

}

-bool IsAvailableMatrix(const CFX_AffineMatrix& matrix)

+FX_BOOL IsAvailableMatrix(const CFX_AffineMatrix& matrix)

{

if (matrix.a == 0 || matrix.d == 0) {

return matrix.b != 0 && matrix.c != 0;

@@ -489,15 +489,15 @@ bool IsAvailableMatrix(const CFX_AffineMatrix& matrix)

if (matrix.b == 0 || matrix.c == 0) {

return matrix.a != 0 && matrix.d != 0;

}

- return true;

+ return TRUE;

}

-bool CPDF_RenderStatus::ProcessPath(CPDF_PathObject* pPathObj, const CFX_AffineMatrix* pObj2Device)

+FX_BOOL CPDF_RenderStatus::ProcessPath(CPDF_PathObject* pPathObj, const CFX_AffineMatrix* pObj2Device)

{

int FillType = pPathObj->m_FillType;

- bool bStroke = pPathObj->m_bStroke;

+ FX_BOOL bStroke = pPathObj->m_bStroke;

ProcessPathPattern(pPathObj, pObj2Device, FillType, bStroke);

if (FillType == 0 && !bStroke) {

- return true;

+ return TRUE;

}

FX_DWORD fill_argb = 0;

if (FillType) {

@@ -510,7 +510,7 @@ bool CPDF_RenderStatus::ProcessPath(CPDF_PathObject* pPathObj, const CFX_AffineM

CFX_AffineMatrix path_matrix = pPathObj->m_Matrix;

path_matrix.Concat(*pObj2Device);

if (!IsAvailableMatrix(path_matrix)) {

- return true;

+ return TRUE;

}

if (FillType && (m_Options.m_Flags & RENDER_RECT_AA)) {

FillType |= FXFILL_RECT_AA;

@@ -546,7 +546,7 @@ CPDF_TransferFunc* CPDF_RenderStatus::GetTransferFunc(CPDF_Object* pObj) const

}

return pDocCache->GetTransferFunc(pObj);

}

-FX_ARGB CPDF_RenderStatus::GetFillArgb(const CPDF_PageObject* pObj, bool bType3) const

+FX_ARGB CPDF_RenderStatus::GetFillArgb(const CPDF_PageObject* pObj, FX_BOOL bType3) const

{

CPDF_ColorStateData* pColorData = (CPDF_ColorStateData*)(const CPDF_ColorStateData*)pObj->m_ColorState;

if (m_pType3Char && !bType3 && (!m_pType3Char->m_bColored || (m_pType3Char->m_bColored && (!pColorData || pColorData->m_FillColor.IsNull())))) {

@@ -612,7 +612,7 @@ void CPDF_RenderStatus::ProcessClipPath(CPDF_ClipPath ClipPath, const CFX_Affine

if (m_LastClipPath.IsNull()) {

return;

}

- m_pDevice->RestoreState(true);

+ m_pDevice->RestoreState(TRUE);

m_LastClipPath.SetNull();

return;

}

@@ -620,7 +620,7 @@ void CPDF_RenderStatus::ProcessClipPath(CPDF_ClipPath ClipPath, const CFX_Affine

return;

}

m_LastClipPath = ClipPath;

- m_pDevice->RestoreState(true);

+ m_pDevice->RestoreState(TRUE);

int nClipPath = ClipPath.GetPathCount();

int i;

for (i = 0; i < nClipPath; i++) {

@@ -690,7 +690,7 @@ void CPDF_RenderStatus::DrawClipPath(CPDF_ClipPath ClipPath, const CFX_AffineMat

m_pDevice->DrawPath(pPathData, pObj2Device, &stroke_state, 0, 0xffff0000, fill_mode);

}

-bool CPDF_RenderStatus::SelectClipPath(CPDF_PathObject* pPathObj, const CFX_AffineMatrix* pObj2Device, bool bStroke)

+FX_BOOL CPDF_RenderStatus::SelectClipPath(CPDF_PathObject* pPathObj, const CFX_AffineMatrix* pObj2Device, FX_BOOL bStroke)

{

CFX_AffineMatrix path_matrix = pPathObj->m_Matrix;

path_matrix.Concat(*pObj2Device);

@@ -707,12 +707,12 @@ bool CPDF_RenderStatus::SelectClipPath(CPDF_PathObject* pPathObj, const CFX_Affi

}

return m_pDevice->SetClip_PathFill(pPathObj->m_Path, &path_matrix, fill_mode);

}

-bool CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, const CFX_AffineMatrix* pObj2Device)

+FX_BOOL CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, const CFX_AffineMatrix* pObj2Device)

{

const CPDF_GeneralStateData* pGeneralState = pPageObj->m_GeneralState;

int blend_type = pGeneralState ? pGeneralState->m_BlendType : FXDIB_BLEND_NORMAL;

if (blend_type == FXDIB_BLEND_UNSUPPORTED) {

- return true;

+ return TRUE;

}

CPDF_Dictionary* pSMaskDict = pGeneralState ? (CPDF_Dictionary*)pGeneralState->m_pSoftMask : NULL;

if (pSMaskDict) {

@@ -724,7 +724,7 @@ bool CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, con

CPDF_Dictionary* pFormResource = NULL;

FX_FLOAT group_alpha = 1.0f;

int Transparency = m_Transparency;

- bool bGroupTransparent = false;

+ FX_BOOL bGroupTransparent = FALSE;

if (pPageObj->m_Type == PDFPAGE_FORM) {

CPDF_FormObject* pFormObj = (CPDF_FormObject*)pPageObj;

const CPDF_GeneralStateData *pStateData = pFormObj->m_GeneralState.GetObject();

@@ -732,15 +732,15 @@ bool CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, con

group_alpha = pStateData->m_FillAlpha;

}

Transparency = pFormObj->m_pForm->m_Transparency;

- bGroupTransparent = Transparency & PDFTRANS_ISOLATED ? true : false;

+ bGroupTransparent = Transparency & PDFTRANS_ISOLATED ? TRUE : FALSE;

if (pFormObj->m_pForm->m_pFormDict) {

pFormResource = pFormObj->m_pForm->m_pFormDict->GetDict("Resources");

}

- bool bTextClip = false;

+ FX_BOOL bTextClip = FALSE;

if (pPageObj->m_ClipPath.NotNull() && pPageObj->m_ClipPath.GetTextCount() &&

m_pDevice->GetDeviceClass() == FXDC_DISPLAY && !(m_pDevice->GetDeviceCaps(FXDC_RENDER_CAPS) & FXRC_SOFT_CLIP)) {

- bTextClip = true;

+ bTextClip = TRUE;

}

if ((m_Options.m_Flags & RENDER_OVERPRINT) && pPageObj->m_Type == PDFPAGE_IMAGE && pGeneralState && pGeneralState->m_FillOP && pGeneralState->m_StrokeOP) {

CPDF_Document* pDocument = NULL;

@@ -763,11 +763,11 @@ bool CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, con

}

if (pSMaskDict == NULL && group_alpha == 1.0f && blend_type == FXDIB_BLEND_NORMAL && !bTextClip && !bGroupTransparent) {

- return false;

+ return FALSE;

}

- bool isolated = Transparency & PDFTRANS_ISOLATED;

+ FX_BOOL isolated = Transparency & PDFTRANS_ISOLATED;

if (m_bPrint) {

- bool bRet = false;

+ FX_BOOL bRet = FALSE;

int rendCaps = m_pDevice->GetRenderCaps();

if (!((Transparency & PDFTRANS_ISOLATED) || pSMaskDict || bTextClip) && (rendCaps & FXRC_BLEND_MODE)) {

int oldBlend = m_curBlend;

@@ -778,12 +778,12 @@ bool CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, con

if (!bRet) {

DrawObjWithBackground(pPageObj, pObj2Device);

}

- return true;

+ return TRUE;

}

FX_RECT rect = pPageObj->GetBBox(pObj2Device);

rect.Intersect(m_pDevice->GetClipBox());

if (rect.IsEmpty()) {

- return true;

+ return TRUE;

}

CFX_Matrix deviceCTM = m_pDevice->GetCTM();

FX_FLOAT scaleX = FXSYS_fabs(deviceCTM.a);

@@ -795,12 +795,12 @@ bool CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, con

if (!isolated && (m_pDevice->GetRenderCaps() & FXRC_GET_BITS)) {

oriDevice = new CFX_DIBitmap;

if (!m_pDevice->CreateCompatibleBitmap(oriDevice, width, height)) {

- return true;

+ return TRUE;

}

m_pDevice->GetDIBits(oriDevice, rect.left, rect.top);

}

if (!bitmap_device.Create(width, height, FXDIB_Argb, 0, oriDevice)) {

- return true;

+ return TRUE;

}

CFX_DIBitmap* bitmap = bitmap_device.GetBitmap();

bitmap->Clear(0);

@@ -812,7 +812,7 @@ bool CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, con

pTextMask = new CFX_DIBitmap;

if (!pTextMask->Create(width, height, FXDIB_8bppMask)) {

delete pTextMask;

- return true;

+ return TRUE;

}

pTextMask->Clear(0);

CFX_FxgeDevice text_device;

@@ -831,7 +831,7 @@ bool CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, con

}

CPDF_RenderStatus bitmap_render;

bitmap_render.Initialize(m_pContext, &bitmap_device, NULL,

- m_pStopObj, NULL, NULL, &m_Options, 0, m_bDropObjects, pFormResource, true);

+ m_pStopObj, NULL, NULL, &m_Options, 0, m_bDropObjects, pFormResource, TRUE);

bitmap_render.ProcessObjectNoClip(pPageObj, &new_matrix);

m_bStopped = bitmap_render.m_bStopped;

if (pSMaskDict) {

@@ -858,10 +858,10 @@ bool CPDF_RenderStatus::ProcessTransparency(const CPDF_PageObject* pPageObj, con

}

CompositeDIBitmap(bitmap, rect.left, rect.top, 0, 255, blend_type, Transparency);

delete oriDevice;

- return true;

+ return TRUE;

}

CFX_DIBitmap* CPDF_RenderStatus::GetBackdrop(const CPDF_PageObject* pObj, const FX_RECT& rect, int& left, int& top,

- bool bBackAlphaRequired)

+ FX_BOOL bBackAlphaRequired)

{

FX_RECT bbox = rect;

bbox.Intersect(m_pDevice->GetClipBox());

@@ -882,7 +882,7 @@ CFX_DIBitmap* CPDF_RenderStatus::GetBackdrop(const CPDF_PageObject* pObj, const

delete pBackdrop;

return NULL;

}

- bool bNeedDraw;

+ FX_BOOL bNeedDraw;

if (pBackdrop->HasAlpha()) {

bNeedDraw = !(m_pDevice->GetRenderCaps() & FXRC_ALPHA_OUTPUT);

} else {

@@ -911,7 +911,7 @@ void CPDF_RenderContext::GetBackground(CFX_DIBitmap* pBuffer, const CPDF_PageObj

device.FillRect(&rect, 0xffffffff);

Render(&device, pObj, pOptions, pFinalMatrix);

}

-CPDF_GraphicStates* CPDF_RenderStatus::CloneObjStates(const CPDF_GraphicStates* pSrcStates, bool bStroke)

+CPDF_GraphicStates* CPDF_RenderStatus::CloneObjStates(const CPDF_GraphicStates* pSrcStates, FX_BOOL bStroke)

{

if (!pSrcStates) {

return NULL;

@@ -932,14 +932,14 @@ CPDF_RenderContext::CPDF_RenderContext()

{

}

void CPDF_RenderContext::Create(CPDF_Document* pDoc, CPDF_PageRenderCache* pPageCache,

- CPDF_Dictionary* pPageResources, bool bFirstLayer)

+ CPDF_Dictionary* pPageResources, FX_BOOL bFirstLayer)

{

m_pDocument = pDoc;

m_pPageResources = pPageResources;

m_pPageCache = pPageCache;

m_bFirstLayer = bFirstLayer;

}

-void CPDF_RenderContext::Create(CPDF_Page* pPage, bool bFirstLayer)

+void CPDF_RenderContext::Create(CPDF_Page* pPage, FX_BOOL bFirstLayer)

{

m_pDocument = pPage->m_pDocument;

m_pPageResources = pPage->m_pPageResources;

@@ -954,7 +954,7 @@ void CPDF_RenderContext::Clear()

m_pDocument = NULL;

m_pPageResources = NULL;

m_pPageCache = NULL;

- m_bFirstLayer = true;

+ m_bFirstLayer = TRUE;

m_ContentList.RemoveAll();

}

void CPDF_RenderContext::AppendObjectList(CPDF_PageObjects* pObjs, const CFX_AffineMatrix* pObject2Device)

@@ -984,7 +984,7 @@ void CPDF_RenderContext::Render(CFX_RenderDevice* pDevice, const CPDF_PageObject

FinalMatrix.Concat(*pLastMatrix);

CPDF_RenderStatus status;

status.Initialize(this, pDevice, pLastMatrix, pStopObj, NULL, NULL, pOptions,

- pItem->m_pObjectList->m_Transparency, false, NULL);

+ pItem->m_pObjectList->m_Transparency, FALSE, NULL);

status.RenderObjectList(pItem->m_pObjectList, &FinalMatrix);

if (status.m_Options.m_Flags & RENDER_LIMITEDIMAGECACHE) {

m_pPageCache->CacheOptimization(status.m_Options.m_dwLimitCacheSize);

@@ -996,7 +996,7 @@ void CPDF_RenderContext::Render(CFX_RenderDevice* pDevice, const CPDF_PageObject

} else {

CPDF_RenderStatus status;

status.Initialize(this, pDevice, NULL, pStopObj, NULL, NULL, pOptions,

- pItem->m_pObjectList->m_Transparency, false, NULL);

+ pItem->m_pObjectList->m_Transparency, FALSE, NULL);

status.RenderObjectList(pItem->m_pObjectList, &pItem->m_Matrix);

if (status.m_Options.m_Flags & RENDER_LIMITEDIMAGECACHE) {

m_pPageCache->CacheOptimization(status.m_Options.m_dwLimitCacheSize);

@@ -1090,7 +1090,7 @@ void CPDF_ProgressiveRenderer::Continue(IFX_Pause* pPause)

m_pRenderStatus.reset(new CPDF_RenderStatus());

m_pRenderStatus->Initialize(

m_pContext, m_pDevice, NULL, NULL, NULL, NULL, m_pOptions,

- pItem->m_pObjectList->m_Transparency, false, NULL);

+ pItem->m_pObjectList->m_Transparency, FALSE, NULL);

m_pDevice->SaveState();

m_ClipRect = m_pDevice->GetClipBox();

CFX_AffineMatrix device2object;

@@ -1171,10 +1171,10 @@ CPDF_TransferFunc* CPDF_DocRenderData::GetTransferFunc(CPDF_Object* pObj)

}

CPDF_Function* pFuncs[3] = { nullptr, nullptr, nullptr };

- bool bUniTransfer = true;

- bool bIdentity = true;

+ FX_BOOL bUniTransfer = TRUE;

+ FX_BOOL bIdentity = TRUE;

if (pObj->GetType() == PDFOBJ_ARRAY) {

- bUniTransfer = false;

+ bUniTransfer = FALSE;

CPDF_Array* pArray = (CPDF_Array*)pObj;

if (pArray->GetCount() < 3)

return nullptr;

@@ -1208,7 +1208,7 @@ CPDF_TransferFunc* CPDF_DocRenderData::GetTransferFunc(CPDF_Object* pObj)

pFuncs[0]->Call(&input, 1, output, noutput);

int o = FXSYS_round(output[0] * 255);

if (o != v)

- bIdentity = false;

+ bIdentity = FALSE;

for (int i = 0; i < 3; ++i) {

pTransfer->m_Samples[i * 256 + v] = o;

}

@@ -1218,7 +1218,7 @@ CPDF_TransferFunc* CPDF_DocRenderData::GetTransferFunc(CPDF_Object* pObj)

pFuncs[i]->Call(&input, 1, output, noutput);

int o = FXSYS_round(output[0] * 255);

if (o != v)

- bIdentity = false;

+ bIdentity = FALSE;

pTransfer->m_Samples[i * 256 + v] = o;

} else {

pTransfer->m_Samples[i * 256 + v] = v;

@@ -1258,7 +1258,7 @@ CPDF_DeviceBuffer::~CPDF_DeviceBuffer()

{

delete m_pBitmap;

}

-bool CPDF_DeviceBuffer::Initialize(CPDF_RenderContext* pContext, CFX_RenderDevice* pDevice, FX_RECT* pRect,

+FX_BOOL CPDF_DeviceBuffer::Initialize(CPDF_RenderContext* pContext, CFX_RenderDevice* pDevice, FX_RECT* pRect,

const CPDF_PageObject* pObj, int max_dpi)

{

m_pDevice = pDevice;

@@ -1289,7 +1289,7 @@ bool CPDF_DeviceBuffer::Initialize(CPDF_RenderContext* pContext, CFX_RenderDevic

FX_RECT bitmap_rect = rect.GetOutterRect();

m_pBitmap = new CFX_DIBitmap;

m_pBitmap->Create(bitmap_rect.Width(), bitmap_rect.Height(), FXDIB_Argb);

- return true;

+ return TRUE;

}

void CPDF_DeviceBuffer::OutputToDevice()

{

@@ -1316,13 +1316,13 @@ CPDF_ScaledRenderBuffer::~CPDF_ScaledRenderBuffer()

delete m_pBitmapDevice;

}

#define _FPDFAPI_IMAGESIZE_LIMIT_ (30 * 1024 * 1024)

-bool CPDF_ScaledRenderBuffer::Initialize(CPDF_RenderContext* pContext, CFX_RenderDevice* pDevice, FX_RECT* pRect,

+FX_BOOL CPDF_ScaledRenderBuffer::Initialize(CPDF_RenderContext* pContext, CFX_RenderDevice* pDevice, FX_RECT* pRect,

const CPDF_PageObject* pObj, const CPDF_RenderOptions *pOptions, int max_dpi)

{

FXSYS_assert(pRect != NULL);

m_pDevice = pDevice;

if (m_pDevice->GetDeviceCaps(FXDC_RENDER_CAPS) & FXRC_GET_BITS) {

- return true;

+ return TRUE;

}

m_pContext = pContext;

m_Rect = *pRect;

@@ -1357,7 +1357,7 @@ bool CPDF_ScaledRenderBuffer::Initialize(CPDF_RenderContext* pContext, CFX_Rende

iHeight = bitmap_rect.Height();

iPitch = (iWidth * bpp + 31) / 32 * 4;

if (iWidth * iHeight < 1) {

- return false;

+ return FALSE;

}

if (iPitch * iHeight <= _FPDFAPI_IMAGESIZE_LIMIT_ &&

m_pBitmapDevice->Create(iWidth, iHeight, dibFormat)) {

@@ -1366,7 +1366,7 @@ bool CPDF_ScaledRenderBuffer::Initialize(CPDF_RenderContext* pContext, CFX_Rende

m_Matrix.Scale(0.5f, 0.5f);

}

m_pContext->GetBackground(m_pBitmapDevice->GetBitmap(), m_pObject, pOptions, &m_Matrix);

- return true;

+ return TRUE;

}

void CPDF_ScaledRenderBuffer::OutputToDevice()

{

@@ -1374,7 +1374,7 @@ void CPDF_ScaledRenderBuffer::OutputToDevice()

m_pDevice->StretchDIBits(m_pBitmapDevice->GetBitmap(), m_Rect.left, m_Rect.top, m_Rect.Width(), m_Rect.Height());

}

-bool IPDF_OCContext::CheckObjectVisible(const CPDF_PageObject* pObj)

+FX_BOOL IPDF_OCContext::CheckObjectVisible(const CPDF_PageObject* pObj)

{

const CPDF_ContentMarkData* pData = pObj->m_ContentMark;

int nItems = pData->CountItems();

@@ -1383,9 +1383,9 @@ bool IPDF_OCContext::CheckObjectVisible(const CPDF_PageObject* pObj)

if (item.GetName() == FX_BSTRC("OC") && item.GetParamType() == CPDF_ContentMarkItem::PropertiesDict) {

CPDF_Dictionary* pOCG = (CPDF_Dictionary*)item.GetParam();

if (!CheckOCGVisible(pOCG)) {

- return false;

+ return FALSE;

}

- return true;

+ return TRUE;

}

« no previous file with comments | « core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp ('k') | core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp » ('j') | no next file with comments »