Rename FPDFText_GetTextRenderMode() to FPDFTextObj_GetTextRenderMode().
This makes naming more consistent in public/fpdf_edit.h.
Also rename FPDFText_GetMatrix() () in the same manner.
Change-Id: I197705176df93a8c1de5eaf4b8ea057d3de63c1d
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/60351
Commit-Queue: dsinclair <dsinclair@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp
index a8c33c7..2c6e7ff 100644
--- a/fpdfsdk/fpdf_edit_embeddertest.cpp
+++ b/fpdfsdk/fpdf_edit_embeddertest.cpp
@@ -1950,10 +1950,11 @@
double matrix_d = 0;
double matrix_e = 0;
double matrix_f = 0;
- EXPECT_FALSE(FPDFText_GetMatrix(nullptr, &matrix_a, &matrix_b, &matrix_c,
- &matrix_d, &matrix_e, &matrix_f));
- EXPECT_TRUE(FPDFText_GetMatrix(text_object3, &matrix_a, &matrix_b, &matrix_c,
- &matrix_d, &matrix_e, &matrix_f));
+ EXPECT_FALSE(FPDFTextObj_GetMatrix(nullptr, &matrix_a, &matrix_b, &matrix_c,
+ &matrix_d, &matrix_e, &matrix_f));
+ EXPECT_TRUE(FPDFTextObj_GetMatrix(text_object3, &matrix_a, &matrix_b,
+ &matrix_c, &matrix_d, &matrix_e,
+ &matrix_f));
EXPECT_EQ(1., matrix_a);
EXPECT_EQ(1.5, matrix_b);
EXPECT_EQ(2., matrix_c);
@@ -1975,13 +1976,13 @@
ASSERT_TRUE(page);
ASSERT_EQ(2, FPDFPage_CountObjects(page));
- ASSERT_EQ(-1, FPDFText_GetTextRenderMode(nullptr));
+ ASSERT_EQ(-1, FPDFTextObj_GetTextRenderMode(nullptr));
FPDF_PAGEOBJECT fill = FPDFPage_GetObject(page, 0);
- ASSERT_EQ(FPDF_TEXTRENDERMODE_FILL, FPDFText_GetTextRenderMode(fill));
+ ASSERT_EQ(FPDF_TEXTRENDERMODE_FILL, FPDFTextObj_GetTextRenderMode(fill));
FPDF_PAGEOBJECT stroke = FPDFPage_GetObject(page, 1);
- ASSERT_EQ(FPDF_TEXTRENDERMODE_STROKE, FPDFText_GetTextRenderMode(stroke));
+ ASSERT_EQ(FPDF_TEXTRENDERMODE_STROKE, FPDFTextObj_GetTextRenderMode(stroke));
UnloadPage(page);
}
diff --git a/fpdfsdk/fpdf_edittext.cpp b/fpdfsdk/fpdf_edittext.cpp
index 66f7080..2ca8faa 100644
--- a/fpdfsdk/fpdf_edittext.cpp
+++ b/fpdfsdk/fpdf_edittext.cpp
@@ -510,13 +510,13 @@
CPDF_Font::GetStockFont(pDoc, ByteStringView(font)).Leak());
}
-FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFText_GetMatrix(FPDF_PAGEOBJECT text,
- double* a,
- double* b,
- double* c,
- double* d,
- double* e,
- double* f) {
+FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFTextObj_GetMatrix(FPDF_PAGEOBJECT text,
+ double* a,
+ double* b,
+ double* c,
+ double* d,
+ double* e,
+ double* f) {
if (!a || !b || !c || !d || !e || !f)
return false;
@@ -590,7 +590,8 @@
return FPDFPageObjectFromCPDFPageObject(pTextObj.release());
}
-FPDF_EXPORT int FPDF_CALLCONV FPDFText_GetTextRenderMode(FPDF_PAGEOBJECT text) {
+FPDF_EXPORT int FPDF_CALLCONV
+FPDFTextObj_GetTextRenderMode(FPDF_PAGEOBJECT text) {
CPDF_TextObject* pTextObj = CPDFTextObjectFromFPDFPageObject(text);
return pTextObj ? static_cast<int>(pTextObj->m_TextState.GetTextMode()) : -1;
}
diff --git a/fpdfsdk/fpdf_view_c_api_test.c b/fpdfsdk/fpdf_view_c_api_test.c
index 6add7a9..ad77fa1 100644
--- a/fpdfsdk/fpdf_view_c_api_test.c
+++ b/fpdfsdk/fpdf_view_c_api_test.c
@@ -208,9 +208,9 @@
CHK(FPDFPath_SetMatrix);
CHK(FPDFTextObj_GetFontName);
CHK(FPDFTextObj_GetFontSize);
+ CHK(FPDFTextObj_GetMatrix);
CHK(FPDFTextObj_GetText);
- CHK(FPDFText_GetMatrix);
- CHK(FPDFText_GetTextRenderMode);
+ CHK(FPDFTextObj_GetTextRenderMode);
CHK(FPDFText_LoadFont);
CHK(FPDFText_LoadStandardFont);
CHK(FPDFText_SetText);
diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h
index 5596c55..335c703 100644
--- a/public/fpdf_edit.h
+++ b/public/fpdf_edit.h
@@ -1133,13 +1133,13 @@
// and used to scale, rotate, shear and translate the text.
//
// Returns TRUE on success.
-FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFText_GetMatrix(FPDF_PAGEOBJECT text,
- double* a,
- double* b,
- double* c,
- double* d,
- double* e,
- double* f);
+FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFTextObj_GetMatrix(FPDF_PAGEOBJECT text,
+ double* a,
+ double* b,
+ double* c,
+ double* d,
+ double* e,
+ double* f);
// Experimental API.
// Get the font size of a text object.
@@ -1173,7 +1173,8 @@
// text - the handle to the text object.
//
// Returns one of the FPDF_TEXTRENDERMODE_* flags on success, -1 on error.
-FPDF_EXPORT int FPDF_CALLCONV FPDFText_GetTextRenderMode(FPDF_PAGEOBJECT text);
+FPDF_EXPORT int FPDF_CALLCONV
+FPDFTextObj_GetTextRenderMode(FPDF_PAGEOBJECT text);
// Experimental API.
// Get the font name of a text object.
