From ecd063eccdb25cbb573d01fc512a3d40322761be Mon Sep 17 00:00:00 2001 From: Julian Lunger Date: Wed, 27 Dec 2017 10:18:50 -0500 Subject: Expose marked content IDs for images and alt text. - Adds two new public bits of API: - StructElement_GetMCID(STRUCTELEMENT) to return the marked content ID of the struct element. - IMAGEOBJ_METADATA.mcid to contain the marked content ID of the image. - Restores ContentMark::GetMCID, which was removed with other dead code in https://pdfium-review.googlesource.com/c/pdfium/+/19170. - Adds a couple calls to tests, including a simple new PDF to test the struct tree marked content ID. Bug:pdfium:957 Change-Id: I92856e43d741df989e53a575a08258da19a39f22 Reviewed-on: https://pdfium-review.googlesource.com/20632 Reviewed-by: Lei Zhang Commit-Queue: Lei Zhang --- fpdfsdk/fpdfedit_embeddertest.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'fpdfsdk/fpdfedit_embeddertest.cpp') diff --git a/fpdfsdk/fpdfedit_embeddertest.cpp b/fpdfsdk/fpdfedit_embeddertest.cpp index 6cb2771154..ee2fc7eb85 100644 --- a/fpdfsdk/fpdfedit_embeddertest.cpp +++ b/fpdfsdk/fpdfedit_embeddertest.cpp @@ -1205,6 +1205,7 @@ TEST_F(FPDFEditEmbeddertest, GetImageMetadata) { // |page|, all values are correct, with the last two being default values. ASSERT_EQ(FPDF_PAGEOBJ_IMAGE, FPDFPageObj_GetType(obj)); ASSERT_TRUE(FPDFImageObj_GetImageMetadata(obj, nullptr, &metadata)); + EXPECT_EQ(7, metadata.marked_content_id); EXPECT_EQ(92u, metadata.width); EXPECT_EQ(68u, metadata.height); EXPECT_NEAR(96.000000, metadata.horizontal_dpi, 0.001); @@ -1214,6 +1215,7 @@ TEST_F(FPDFEditEmbeddertest, GetImageMetadata) { // Verify the metadata of a bitmap image with indexed colorspace. ASSERT_TRUE(FPDFImageObj_GetImageMetadata(obj, page, &metadata)); + EXPECT_EQ(7, metadata.marked_content_id); EXPECT_EQ(92u, metadata.width); EXPECT_EQ(68u, metadata.height); EXPECT_NEAR(96.000000, metadata.horizontal_dpi, 0.001); @@ -1225,6 +1227,7 @@ TEST_F(FPDFEditEmbeddertest, GetImageMetadata) { obj = FPDFPage_GetObject(page, 37); ASSERT_EQ(FPDF_PAGEOBJ_IMAGE, FPDFPageObj_GetType(obj)); ASSERT_TRUE(FPDFImageObj_GetImageMetadata(obj, page, &metadata)); + EXPECT_EQ(9, metadata.marked_content_id); EXPECT_EQ(126u, metadata.width); EXPECT_EQ(106u, metadata.height); EXPECT_NEAR(162.173752, metadata.horizontal_dpi, 0.001); -- cgit v1.2.3