From 366df7fd6e6b75e0500e67960a20dc3129c703d6 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 22 May 2018 14:27:29 +0000 Subject: Add FPDFPageObj_GetStrokeWidth() API It was already possible to set the stroke width of a page object, this is the other direction. Change-Id: I5c4681b232768fc928bc7a169f223877284d4812 Reviewed-on: https://pdfium-review.googlesource.com/32770 Reviewed-by: dsinclair Commit-Queue: dsinclair --- fpdfsdk/fpdf_edit_embeddertest.cpp | 5 +++++ fpdfsdk/fpdf_editpage.cpp | 10 ++++++++++ fpdfsdk/fpdf_view_c_api_test.c | 1 + public/fpdf_edit.h | 10 ++++++++++ 4 files changed, 26 insertions(+) diff --git a/fpdfsdk/fpdf_edit_embeddertest.cpp b/fpdfsdk/fpdf_edit_embeddertest.cpp index a20faeba80..2a3a7768ff 100644 --- a/fpdfsdk/fpdf_edit_embeddertest.cpp +++ b/fpdfsdk/fpdf_edit_embeddertest.cpp @@ -755,6 +755,11 @@ TEST_F(FPDFEditEmbeddertest, AddStrokedPaths) { EXPECT_TRUE(FPDFPath_SetFillColor(rect, 255, 0, 0, 255)); EXPECT_TRUE(FPDFPath_SetStrokeColor(rect, 0, 255, 0, 255)); EXPECT_TRUE(FPDFPath_SetStrokeWidth(rect, 15.0f)); + + float width = 0; + EXPECT_TRUE(FPDFPageObj_GetStrokeWidth(rect, &width)); + EXPECT_EQ(15.0f, width); + EXPECT_TRUE(FPDFPath_SetDrawMode(rect, 0, 1)); FPDFPage_InsertObject(page, rect); { diff --git a/fpdfsdk/fpdf_editpage.cpp b/fpdfsdk/fpdf_editpage.cpp index 1a9198b291..ea4659f54a 100644 --- a/fpdfsdk/fpdf_editpage.cpp +++ b/fpdfsdk/fpdf_editpage.cpp @@ -591,6 +591,16 @@ FPDFPageObj_SetStrokeWidth(FPDF_PAGEOBJECT page_object, float width) { return true; } +FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV +FPDFPageObj_GetStrokeWidth(FPDF_PAGEOBJECT page_object, float* width) { + auto* pPageObj = CPDFPageObjectFromFPDFPageObject(page_object); + if (!pPageObj || !width) + return false; + + *width = pPageObj->m_GraphState.GetLineWidth(); + return true; +} + FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPageObj_SetLineJoin(FPDF_PAGEOBJECT page_object, int line_join) { if (!page_object) diff --git a/fpdfsdk/fpdf_view_c_api_test.c b/fpdfsdk/fpdf_view_c_api_test.c index 15d893d77c..946e415077 100644 --- a/fpdfsdk/fpdf_view_c_api_test.c +++ b/fpdfsdk/fpdf_view_c_api_test.c @@ -170,6 +170,7 @@ int CheckPDFiumCApi() { CHK(FPDFPath_GetStrokeColor); CHK(FPDFPageObj_GetStrokeColor); CHK(FPDFPath_SetStrokeWidth); + CHK(FPDFPageObj_GetStrokeWidth); CHK(FPDFPageObj_SetStrokeWidth); CHK(FPDFPath_SetFillColor); CHK(FPDFPageObj_SetFillColor); diff --git a/public/fpdf_edit.h b/public/fpdf_edit.h index 6eca64fde1..c950e2fa72 100644 --- a/public/fpdf_edit.h +++ b/public/fpdf_edit.h @@ -687,6 +687,16 @@ FPDFPath_SetStrokeWidth(FPDF_PAGEOBJECT path, float width); FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFPageObj_SetStrokeWidth(FPDF_PAGEOBJECT page_object, float width); +// Experimental API. +// Get the stroke width of a page object. +// +// path - the handle to the page object. +// width - the width of the stroke. +// +// Returns TRUE on success +FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV +FPDFPageObj_GetStrokeWidth(FPDF_PAGEOBJECT page_object, float* width); + // DEPRECATED as of May 2018. This API will be removed in the future. Please // use FPDFPageObj_SetLineJoin instead. // -- cgit v1.2.3