Rename CPDF_PageObject::Type values to kFoo.
Also make it an enum class.
Bug: pdfium:547
Change-Id: Ic2335c19c9da5f1da922cb253696bcee261940b8
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/90755
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fpdfapi/page/cpdf_formobject.cpp b/core/fpdfapi/page/cpdf_formobject.cpp
index 84e070c..cb03346 100644
--- a/core/fpdfapi/page/cpdf_formobject.cpp
+++ b/core/fpdfapi/page/cpdf_formobject.cpp
@@ -38,7 +38,7 @@
}
CPDF_PageObject::Type CPDF_FormObject::GetType() const {
- return FORM;
+ return Type::kForm;
}
void CPDF_FormObject::CalcBoundingBox() {
diff --git a/core/fpdfapi/page/cpdf_imageobject.cpp b/core/fpdfapi/page/cpdf_imageobject.cpp
index 44ca600..278fb84 100644
--- a/core/fpdfapi/page/cpdf_imageobject.cpp
+++ b/core/fpdfapi/page/cpdf_imageobject.cpp
@@ -22,7 +22,7 @@
}
CPDF_PageObject::Type CPDF_ImageObject::GetType() const {
- return IMAGE;
+ return Type::kImage;
}
void CPDF_ImageObject::Transform(const CFX_Matrix& matrix) {
diff --git a/core/fpdfapi/page/cpdf_pageobject.h b/core/fpdfapi/page/cpdf_pageobject.h
index 9142377..60626af 100644
--- a/core/fpdfapi/page/cpdf_pageobject.h
+++ b/core/fpdfapi/page/cpdf_pageobject.h
@@ -21,12 +21,13 @@
class CPDF_PageObject : public CPDF_GraphicStates {
public:
- enum Type {
- TEXT = 1,
- PATH,
- IMAGE,
- SHADING,
- FORM,
+ // Values must match corresponding values in //public.
+ enum class Type {
+ kText = 1,
+ kPath,
+ kImage,
+ kShading,
+ kForm,
};
static constexpr int32_t kNoContentStream = -1;
@@ -82,7 +83,6 @@
m_ContentStream = new_content_stream;
}
-
protected:
void CopyData(const CPDF_PageObject* pSrcObject);
diff --git a/core/fpdfapi/page/cpdf_pathobject.cpp b/core/fpdfapi/page/cpdf_pathobject.cpp
index 7082734..fda906d 100644
--- a/core/fpdfapi/page/cpdf_pathobject.cpp
+++ b/core/fpdfapi/page/cpdf_pathobject.cpp
@@ -14,7 +14,7 @@
CPDF_PathObject::~CPDF_PathObject() = default;
CPDF_PageObject::Type CPDF_PathObject::GetType() const {
- return PATH;
+ return Type::kPath;
}
void CPDF_PathObject::Transform(const CFX_Matrix& matrix) {
diff --git a/core/fpdfapi/page/cpdf_shadingobject.cpp b/core/fpdfapi/page/cpdf_shadingobject.cpp
index 7158de1..6218dea 100644
--- a/core/fpdfapi/page/cpdf_shadingobject.cpp
+++ b/core/fpdfapi/page/cpdf_shadingobject.cpp
@@ -16,7 +16,7 @@
CPDF_ShadingObject::~CPDF_ShadingObject() = default;
CPDF_PageObject::Type CPDF_ShadingObject::GetType() const {
- return SHADING;
+ return Type::kShading;
}
void CPDF_ShadingObject::Transform(const CFX_Matrix& matrix) {
diff --git a/core/fpdfapi/page/cpdf_textobject.cpp b/core/fpdfapi/page/cpdf_textobject.cpp
index f829b4b..bb6a1b8 100644
--- a/core/fpdfapi/page/cpdf_textobject.cpp
+++ b/core/fpdfapi/page/cpdf_textobject.cpp
@@ -152,7 +152,7 @@
}
CPDF_PageObject::Type CPDF_TextObject::GetType() const {
- return TEXT;
+ return Type::kText;
}
void CPDF_TextObject::Transform(const CFX_Matrix& matrix) {
diff --git a/core/fpdfapi/render/cpdf_renderoptions.cpp b/core/fpdfapi/render/cpdf_renderoptions.cpp
index 805b91f..69701cf 100644
--- a/core/fpdfapi/render/cpdf_renderoptions.cpp
+++ b/core/fpdfapi/render/cpdf_renderoptions.cpp
@@ -53,10 +53,10 @@
return TranslateColor(argb);
switch (object_type) {
- case CPDF_PageObject::Type::PATH:
+ case CPDF_PageObject::Type::kPath:
return render_type == RenderType::kFill ? m_ColorScheme.path_fill_color
: m_ColorScheme.path_stroke_color;
- case CPDF_PageObject::Type::TEXT:
+ case CPDF_PageObject::Type::kText:
return render_type == RenderType::kFill ? m_ColorScheme.text_fill_color
: m_ColorScheme.text_stroke_color;
default:
diff --git a/core/fpdfapi/render/cpdf_renderstatus.cpp b/core/fpdfapi/render/cpdf_renderstatus.cpp
index 0d6155b..a27f2ad 100644
--- a/core/fpdfapi/render/cpdf_renderstatus.cpp
+++ b/core/fpdfapi/render/cpdf_renderstatus.cpp
@@ -304,19 +304,19 @@
#endif
bool bRet = false;
switch (pObj->GetType()) {
- case CPDF_PageObject::TEXT:
+ case CPDF_PageObject::Type::kText:
bRet = ProcessText(pObj->AsText(), mtObj2Device, nullptr);
break;
- case CPDF_PageObject::PATH:
+ case CPDF_PageObject::Type::kPath:
bRet = ProcessPath(pObj->AsPath(), mtObj2Device);
break;
- case CPDF_PageObject::IMAGE:
+ case CPDF_PageObject::Type::kImage:
bRet = ProcessImage(pObj->AsImage(), mtObj2Device);
break;
- case CPDF_PageObject::SHADING:
+ case CPDF_PageObject::Type::kShading:
ProcessShading(pObj->AsShading(), mtObj2Device);
return;
- case CPDF_PageObject::FORM:
+ case CPDF_PageObject::Type::kForm:
bRet = ProcessForm(pObj->AsForm(), mtObj2Device);
break;
}
@@ -330,11 +330,11 @@
bool CPDF_RenderStatus::DrawObjWithBlend(CPDF_PageObject* pObj,
const CFX_Matrix& mtObj2Device) {
switch (pObj->GetType()) {
- case CPDF_PageObject::PATH:
+ case CPDF_PageObject::Type::kPath:
return ProcessPath(pObj->AsPath(), mtObj2Device);
- case CPDF_PageObject::IMAGE:
+ case CPDF_PageObject::Type::kImage:
return ProcessImage(pObj->AsImage(), mtObj2Device);
- case CPDF_PageObject::FORM:
+ case CPDF_PageObject::Type::kForm:
return ProcessForm(pObj->AsForm(), mtObj2Device);
default:
return false;
diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp
index 32bddf1..12658e5 100644
--- a/fpdfsdk/fpdf_editpage.cpp
+++ b/fpdfsdk/fpdf_editpage.cpp
@@ -46,15 +46,20 @@
namespace {
-static_assert(FPDF_PAGEOBJ_TEXT == CPDF_PageObject::TEXT,
+static_assert(FPDF_PAGEOBJ_TEXT ==
+ static_cast<int>(CPDF_PageObject::Type::kText),
"FPDF_PAGEOBJ_TEXT/CPDF_PageObject::TEXT mismatch");
-static_assert(FPDF_PAGEOBJ_PATH == CPDF_PageObject::PATH,
+static_assert(FPDF_PAGEOBJ_PATH ==
+ static_cast<int>(CPDF_PageObject::Type::kPath),
"FPDF_PAGEOBJ_PATH/CPDF_PageObject::PATH mismatch");
-static_assert(FPDF_PAGEOBJ_IMAGE == CPDF_PageObject::IMAGE,
+static_assert(FPDF_PAGEOBJ_IMAGE ==
+ static_cast<int>(CPDF_PageObject::Type::kImage),
"FPDF_PAGEOBJ_IMAGE/CPDF_PageObject::IMAGE mismatch");
-static_assert(FPDF_PAGEOBJ_SHADING == CPDF_PageObject::SHADING,
+static_assert(FPDF_PAGEOBJ_SHADING ==
+ static_cast<int>(CPDF_PageObject::Type::kShading),
"FPDF_PAGEOBJ_SHADING/CPDF_PageObject::SHADING mismatch");
-static_assert(FPDF_PAGEOBJ_FORM == CPDF_PageObject::FORM,
+static_assert(FPDF_PAGEOBJ_FORM ==
+ static_cast<int>(CPDF_PageObject::Type::kForm),
"FPDF_PAGEOBJ_FORM/CPDF_PageObject::FORM mismatch");
bool IsPageObject(CPDF_Page* pPage) {
@@ -72,25 +77,25 @@
void CalcBoundingBox(CPDF_PageObject* pPageObj) {
switch (pPageObj->GetType()) {
- case CPDF_PageObject::TEXT: {
+ case CPDF_PageObject::Type::kText: {
break;
}
- case CPDF_PageObject::PATH: {
+ case CPDF_PageObject::Type::kPath: {
CPDF_PathObject* pPathObj = pPageObj->AsPath();
pPathObj->CalcBoundingBox();
break;
}
- case CPDF_PageObject::IMAGE: {
+ case CPDF_PageObject::Type::kImage: {
CPDF_ImageObject* pImageObj = pPageObj->AsImage();
pImageObj->CalcBoundingBox();
break;
}
- case CPDF_PageObject::SHADING: {
+ case CPDF_PageObject::Type::kShading: {
CPDF_ShadingObject* pShadingObj = pPageObj->AsShading();
pShadingObj->CalcBoundingBox();
break;
}
- case CPDF_PageObject::FORM: {
+ case CPDF_PageObject::Type::kForm: {
CPDF_FormObject* pFormObj = pPageObj->AsForm();
pFormObj->CalcBoundingBox();
break;
@@ -587,7 +592,8 @@
FPDF_EXPORT int FPDF_CALLCONV FPDFPageObj_GetType(FPDF_PAGEOBJECT page_object) {
CPDF_PageObject* pPageObj = CPDFPageObjectFromFPDFPageObject(page_object);
- return pPageObj ? pPageObj->GetType() : FPDF_PAGEOBJ_UNKNOWN;
+ return pPageObj ? static_cast<int>(pPageObj->GetType())
+ : FPDF_PAGEOBJ_UNKNOWN;
}
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPage_GenerateContent(FPDF_PAGE page) {
@@ -623,18 +629,18 @@
return false;
switch (pPageObj->GetType()) {
- case CPDF_PageObject::TEXT:
+ case CPDF_PageObject::Type::kText:
*matrix = FSMatrixFromCFXMatrix(pPageObj->AsText()->GetTextMatrix());
return true;
- case CPDF_PageObject::PATH:
+ case CPDF_PageObject::Type::kPath:
*matrix = FSMatrixFromCFXMatrix(pPageObj->AsPath()->matrix());
return true;
- case CPDF_PageObject::IMAGE:
+ case CPDF_PageObject::Type::kImage:
*matrix = FSMatrixFromCFXMatrix(pPageObj->AsImage()->matrix());
return true;
- case CPDF_PageObject::SHADING:
+ case CPDF_PageObject::Type::kShading:
return false;
- case CPDF_PageObject::FORM:
+ case CPDF_PageObject::Type::kForm:
*matrix = FSMatrixFromCFXMatrix(pPageObj->AsForm()->form_matrix());
return true;
default:
@@ -651,18 +657,18 @@
CFX_Matrix cmatrix = CFXMatrixFromFSMatrix(*matrix);
switch (pPageObj->GetType()) {
- case CPDF_PageObject::TEXT:
+ case CPDF_PageObject::Type::kText:
pPageObj->AsText()->SetTextMatrix(cmatrix);
break;
- case CPDF_PageObject::PATH:
+ case CPDF_PageObject::Type::kPath:
pPageObj->AsPath()->SetPathMatrix(cmatrix);
break;
- case CPDF_PageObject::IMAGE:
+ case CPDF_PageObject::Type::kImage:
pPageObj->AsImage()->SetImageMatrix(cmatrix);
break;
- case CPDF_PageObject::SHADING:
+ case CPDF_PageObject::Type::kShading:
return false;
- case CPDF_PageObject::FORM:
+ case CPDF_PageObject::Type::kForm:
pPageObj->AsForm()->SetFormMatrix(cmatrix);
break;
default:
