summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp22
-rw-r--r--core/fpdfapi/render/fpdf_render_loadimage_embeddertest.cpp21
-rw-r--r--core/fpdfapi/render/fpdf_render_pattern_embeddertest.cpp8
-rw-r--r--fpdfsdk/fpdfedit_embeddertest.cpp209
-rw-r--r--fpdfsdk/fpdfppo_embeddertest.cpp56
-rw-r--r--fpdfsdk/fpdfview_embeddertest.cpp10
-rw-r--r--testing/embedder_test.cpp4
-rw-r--r--testing/embedder_test.h4
8 files changed, 178 insertions, 156 deletions
diff --git a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
index 20e8cf775c..0a7dde9b05 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode_embeddertest.cpp
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "core/fpdfapi/parser/fpdf_parser_decode.h"
-
#include <cstring>
+#include <memory>
#include <string>
+#include "core/fpdfapi/parser/fpdf_parser_decode.h"
#include "testing/embedder_test.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/test_support.h"
@@ -93,9 +93,9 @@ TEST_F(FPDFParserDecodeEmbeddertest, Bug_552046) {
// crash when rendered.
EXPECT_TRUE(OpenDocument("bug_552046.pdf"));
FPDF_PAGE page = LoadPage(0);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
- CompareBitmap(bitmap, 612, 792, "1940568c9ba33bac5d0b1ee9558c76b3");
- FPDFBitmap_Destroy(bitmap);
+ ASSERT_TRUE(page);
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
+ CompareBitmap(bitmap.get(), 612, 792, "1940568c9ba33bac5d0b1ee9558c76b3");
UnloadPage(page);
}
@@ -104,9 +104,9 @@ TEST_F(FPDFParserDecodeEmbeddertest, Bug_555784) {
// Should not cause a crash when rendered.
EXPECT_TRUE(OpenDocument("bug_555784.pdf"));
FPDF_PAGE page = LoadPage(0);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
- CompareBitmap(bitmap, 612, 792, "1940568c9ba33bac5d0b1ee9558c76b3");
- FPDFBitmap_Destroy(bitmap);
+ ASSERT_TRUE(page);
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
+ CompareBitmap(bitmap.get(), 612, 792, "1940568c9ba33bac5d0b1ee9558c76b3");
UnloadPage(page);
}
@@ -115,7 +115,8 @@ TEST_F(FPDFParserDecodeEmbeddertest, Bug_455199) {
// Should open successfully.
EXPECT_TRUE(OpenDocument("bug_455199.pdf"));
FPDF_PAGE page = LoadPage(0);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
+ ASSERT_TRUE(page);
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
const char kExpectedMd5sum[] = "b90475ca64d1348c3bf5e2b77ad9187a";
#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
@@ -123,7 +124,6 @@ TEST_F(FPDFParserDecodeEmbeddertest, Bug_455199) {
#else
const char kExpectedMd5sum[] = "2baa4c0e1758deba1b9c908e1fbd04ed";
#endif
- CompareBitmap(bitmap, 200, 200, kExpectedMd5sum);
- FPDFBitmap_Destroy(bitmap);
+ CompareBitmap(bitmap.get(), 200, 200, kExpectedMd5sum);
UnloadPage(page);
}
diff --git a/core/fpdfapi/render/fpdf_render_loadimage_embeddertest.cpp b/core/fpdfapi/render/fpdf_render_loadimage_embeddertest.cpp
index caf4673b85..588b974e29 100644
--- a/core/fpdfapi/render/fpdf_render_loadimage_embeddertest.cpp
+++ b/core/fpdfapi/render/fpdf_render_loadimage_embeddertest.cpp
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "testing/embedder_test.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -12,10 +14,9 @@ TEST_F(FPDFRenderLoadImageEmbeddertest, Bug_554151) {
// Should not crash.
EXPECT_TRUE(OpenDocument("bug_554151.pdf"));
FPDF_PAGE page = LoadPage(0);
- EXPECT_NE(nullptr, page);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
- CompareBitmap(bitmap, 612, 792, "a14d7ee573c1b2456d7bf6b7762823cf");
- FPDFBitmap_Destroy(bitmap);
+ ASSERT_TRUE(page);
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
+ CompareBitmap(bitmap.get(), 612, 792, "a14d7ee573c1b2456d7bf6b7762823cf");
UnloadPage(page);
}
@@ -23,10 +24,9 @@ TEST_F(FPDFRenderLoadImageEmbeddertest, Bug_557223) {
// Should not crash
EXPECT_TRUE(OpenDocument("bug_557223.pdf"));
FPDF_PAGE page = LoadPage(0);
- EXPECT_NE(nullptr, page);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
- CompareBitmap(bitmap, 24, 24, "dc0ea1b743c2edb22c597cadc8537f7b");
- FPDFBitmap_Destroy(bitmap);
+ ASSERT_TRUE(page);
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
+ CompareBitmap(bitmap.get(), 24, 24, "dc0ea1b743c2edb22c597cadc8537f7b");
UnloadPage(page);
}
@@ -35,8 +35,7 @@ TEST_F(FPDFRenderLoadImageEmbeddertest, Bug_603518) {
EXPECT_TRUE(OpenDocument("bug_603518.pdf"));
FPDF_PAGE page = LoadPage(0);
EXPECT_NE(nullptr, page);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
- CompareBitmap(bitmap, 749, 749, "b9e75190cdc5edf0069a408744ca07dc");
- FPDFBitmap_Destroy(bitmap);
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
+ CompareBitmap(bitmap.get(), 749, 749, "b9e75190cdc5edf0069a408744ca07dc");
UnloadPage(page);
}
diff --git a/core/fpdfapi/render/fpdf_render_pattern_embeddertest.cpp b/core/fpdfapi/render/fpdf_render_pattern_embeddertest.cpp
index f141590f46..00b0933b71 100644
--- a/core/fpdfapi/render/fpdf_render_pattern_embeddertest.cpp
+++ b/core/fpdfapi/render/fpdf_render_pattern_embeddertest.cpp
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "testing/embedder_test.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -11,8 +13,8 @@ TEST_F(FPDFRenderPatternEmbeddertest, LoadError_547706) {
// Test shading where object is a dictionary instead of a stream.
EXPECT_TRUE(OpenDocument("bug_547706.pdf"));
FPDF_PAGE page = LoadPage(0);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
- CompareBitmap(bitmap, 612, 792, "1940568c9ba33bac5d0b1ee9558c76b3");
- FPDFBitmap_Destroy(bitmap);
+ ASSERT_TRUE(page);
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
+ CompareBitmap(bitmap.get(), 612, 792, "1940568c9ba33bac5d0b1ee9558c76b3");
UnloadPage(page);
}
diff --git a/fpdfsdk/fpdfedit_embeddertest.cpp b/fpdfsdk/fpdfedit_embeddertest.cpp
index f27cf747c1..3787318418 100644
--- a/fpdfsdk/fpdfedit_embeddertest.cpp
+++ b/fpdfsdk/fpdfedit_embeddertest.cpp
@@ -192,13 +192,13 @@ TEST_F(FPDFEditEmbeddertest, RasterizePDF) {
const char kAllBlackMd5sum[] = "5708fc5c4a8bd0abde99c8e8f0390615";
// Get the bitmap for the original document/
- FPDF_BITMAP orig_bitmap;
+ std::unique_ptr<void, FPDFBitmapDeleter> orig_bitmap;
{
EXPECT_TRUE(OpenDocument("black.pdf"));
FPDF_PAGE orig_page = LoadPage(0);
- EXPECT_NE(nullptr, orig_page);
- orig_bitmap = RenderPageDeprecated(orig_page);
- CompareBitmap(orig_bitmap, 612, 792, kAllBlackMd5sum);
+ ASSERT_TRUE(orig_page);
+ orig_bitmap = RenderLoadedPage(orig_page);
+ CompareBitmap(orig_bitmap.get(), 612, 792, kAllBlackMd5sum);
UnloadPage(orig_page);
}
@@ -210,7 +210,8 @@ TEST_F(FPDFEditEmbeddertest, RasterizePDF) {
// Add the bitmap to an image object and add the image object to the output
// page.
FPDF_PAGEOBJECT temp_img = FPDFPageObj_NewImageObj(temp_doc);
- EXPECT_TRUE(FPDFImageObj_SetBitmap(&temp_page, 1, temp_img, orig_bitmap));
+ EXPECT_TRUE(
+ FPDFImageObj_SetBitmap(&temp_page, 1, temp_img, orig_bitmap.get()));
EXPECT_TRUE(FPDFImageObj_SetMatrix(temp_img, 612, 0, 0, 792, 0, 0));
FPDFPage_InsertObject(temp_page, temp_img);
EXPECT_TRUE(FPDFPage_GenerateContent(temp_page));
@@ -218,7 +219,6 @@ TEST_F(FPDFEditEmbeddertest, RasterizePDF) {
FPDF_ClosePage(temp_page);
FPDF_CloseDocument(temp_doc);
}
- FPDFBitmap_Destroy(orig_bitmap);
// Get the generated content. Make sure it is at least as big as the original
// PDF.
@@ -229,10 +229,11 @@ TEST_F(FPDFEditEmbeddertest, RasterizePDF) {
TEST_F(FPDFEditEmbeddertest, AddPaths) {
// Start with a blank page
FPDF_PAGE page = FPDFPage_New(CreateNewDocument(), 0, 612, 792);
+ ASSERT_TRUE(page);
// We will first add a red rectangle
FPDF_PAGEOBJECT red_rect = FPDFPageObj_CreateNewRect(10, 10, 20, 20);
- ASSERT_NE(nullptr, red_rect);
+ ASSERT_TRUE(red_rect);
// Expect false when trying to set colors out of range
EXPECT_FALSE(FPDFPath_SetStrokeColor(red_rect, 100, 100, 100, 300));
EXPECT_FALSE(FPDFPath_SetFillColor(red_rect, 200, 256, 200, 0));
@@ -241,9 +242,12 @@ TEST_F(FPDFEditEmbeddertest, AddPaths) {
EXPECT_TRUE(FPDFPath_SetFillColor(red_rect, 255, 0, 0, 255));
EXPECT_TRUE(FPDFPath_SetDrawMode(red_rect, FPDF_FILLMODE_ALTERNATE, 0));
FPDFPage_InsertObject(page, red_rect);
- FPDF_BITMAP page_bitmap = RenderPageDeprecated(page);
- CompareBitmap(page_bitmap, 612, 792, "66d02eaa6181e2c069ce2ea99beda497");
- FPDFBitmap_Destroy(page_bitmap);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ CompareBitmap(page_bitmap.get(), 612, 792,
+ "66d02eaa6181e2c069ce2ea99beda497");
+ }
// Now add to that a green rectangle with some medium alpha
FPDF_PAGEOBJECT green_rect = FPDFPageObj_CreateNewRect(100, 100, 40, 40);
@@ -302,9 +306,12 @@ TEST_F(FPDFEditEmbeddertest, AddPaths) {
EXPECT_TRUE(FPDFPath_SetDrawMode(green_rect, FPDF_FILLMODE_WINDING, 0));
FPDFPage_InsertObject(page, green_rect);
- page_bitmap = RenderPageDeprecated(page);
- CompareBitmap(page_bitmap, 612, 792, "7b0b87604594e773add528fae567a558");
- FPDFBitmap_Destroy(page_bitmap);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ CompareBitmap(page_bitmap.get(), 612, 792,
+ "7b0b87604594e773add528fae567a558");
+ }
// Add a black triangle.
FPDF_PAGEOBJECT black_path = FPDFPageObj_CreateNewPath(400, 100);
@@ -340,9 +347,12 @@ TEST_F(FPDFEditEmbeddertest, AddPaths) {
EXPECT_EQ(nullptr, FPDFPath_GetPathSegment(black_path, 3));
FPDFPage_InsertObject(page, black_path);
- page_bitmap = RenderPageDeprecated(page);
- CompareBitmap(page_bitmap, 612, 792, "eadc8020a14dfcf091da2688733d8806");
- FPDFBitmap_Destroy(page_bitmap);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ CompareBitmap(page_bitmap.get(), 612, 792,
+ "eadc8020a14dfcf091da2688733d8806");
+ }
// Now add a more complex blue path.
FPDF_PAGEOBJECT blue_path = FPDFPageObj_CreateNewPath(200, 200);
@@ -355,10 +365,12 @@ TEST_F(FPDFEditEmbeddertest, AddPaths) {
EXPECT_TRUE(FPDFPath_BezierTo(blue_path, 375, 330, 390, 360, 400, 400));
EXPECT_TRUE(FPDFPath_Close(blue_path));
FPDFPage_InsertObject(page, blue_path);
- page_bitmap = RenderPageDeprecated(page);
- const char last_md5[] = "9823e1a21bd9b72b6a442ba4f12af946";
- CompareBitmap(page_bitmap, 612, 792, last_md5);
- FPDFBitmap_Destroy(page_bitmap);
+ const char kLastMD5[] = "9823e1a21bd9b72b6a442ba4f12af946";
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ CompareBitmap(page_bitmap.get(), 612, 792, kLastMD5);
+ }
// Now save the result, closing the page and document
EXPECT_TRUE(FPDFPage_GenerateContent(page));
@@ -366,7 +378,7 @@ TEST_F(FPDFEditEmbeddertest, AddPaths) {
FPDF_ClosePage(page);
// Render the saved result
- VerifySavedDocument(612, 792, last_md5);
+ VerifySavedDocument(612, 792, kLastMD5);
}
TEST_F(FPDFEditEmbeddertest, PathsPoints) {
@@ -400,7 +412,7 @@ TEST_F(FPDFEditEmbeddertest, PathOnTopOfText) {
// Load document with some text
EXPECT_TRUE(OpenDocument("hello_world.pdf"));
FPDF_PAGE page = LoadPage(0);
- EXPECT_NE(nullptr, page);
+ ASSERT_TRUE(page);
// Add an opaque rectangle on top of some of the text.
FPDF_PAGEOBJECT red_rect = FPDFPageObj_CreateNewRect(20, 100, 50, 50);
@@ -418,14 +430,13 @@ TEST_F(FPDFEditEmbeddertest, PathOnTopOfText) {
FPDFPage_InsertObject(page, black_path);
// Render and check the result. Text is slightly different on Mac.
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
const char md5[] = "f9e6fa74230f234286bfcada9f7606d8";
#else
const char md5[] = "aa71b09b93b55f467f1290e5111babee";
#endif
- CompareBitmap(bitmap, 200, 200, md5);
- FPDFBitmap_Destroy(bitmap);
+ CompareBitmap(bitmap.get(), 200, 200, md5);
UnloadPage(page);
}
@@ -433,7 +444,7 @@ TEST_F(FPDFEditEmbeddertest, EditOverExistingContent) {
// Load document with existing content
EXPECT_TRUE(OpenDocument("bug_717.pdf"));
FPDF_PAGE page = LoadPage(0);
- EXPECT_NE(nullptr, page);
+ ASSERT_TRUE(page);
// Add a transparent rectangle on top of the existing content
FPDF_PAGEOBJECT red_rect2 = FPDFPageObj_CreateNewRect(90, 700, 25, 50);
@@ -447,9 +458,8 @@ TEST_F(FPDFEditEmbeddertest, EditOverExistingContent) {
EXPECT_TRUE(FPDFPath_SetDrawMode(red_rect, FPDF_FILLMODE_ALTERNATE, 0));
FPDFPage_InsertObject(page, red_rect);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
- CompareBitmap(bitmap, 612, 792, "ad04e5bd0f471a9a564fb034bd0fb073");
- FPDFBitmap_Destroy(bitmap);
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
+ CompareBitmap(bitmap.get(), 612, 792, "ad04e5bd0f471a9a564fb034bd0fb073");
EXPECT_TRUE(FPDFPage_GenerateContent(page));
// Now save the result, closing the page and document
@@ -457,32 +467,33 @@ TEST_F(FPDFEditEmbeddertest, EditOverExistingContent) {
UnloadPage(page);
OpenSavedDocument();
- page = LoadSavedPage(0);
- VerifySavedRendering(page, 612, 792, "ad04e5bd0f471a9a564fb034bd0fb073");
+ FPDF_PAGE saved_page = LoadSavedPage(0);
+ VerifySavedRendering(saved_page, 612, 792,
+ "ad04e5bd0f471a9a564fb034bd0fb073");
ClearString();
// Add another opaque rectangle on top of the existing content
FPDF_PAGEOBJECT green_rect = FPDFPageObj_CreateNewRect(150, 700, 25, 50);
EXPECT_TRUE(FPDFPath_SetFillColor(green_rect, 0, 255, 0, 255));
EXPECT_TRUE(FPDFPath_SetDrawMode(green_rect, FPDF_FILLMODE_ALTERNATE, 0));
- FPDFPage_InsertObject(page, green_rect);
+ FPDFPage_InsertObject(saved_page, green_rect);
// Add another transparent rectangle on top of existing content
FPDF_PAGEOBJECT green_rect2 = FPDFPageObj_CreateNewRect(175, 700, 25, 50);
EXPECT_TRUE(FPDFPath_SetFillColor(green_rect2, 0, 255, 0, 100));
EXPECT_TRUE(FPDFPath_SetDrawMode(green_rect2, FPDF_FILLMODE_ALTERNATE, 0));
- FPDFPage_InsertObject(page, green_rect2);
+ FPDFPage_InsertObject(saved_page, green_rect2);
FPDF_BITMAP new_bitmap =
- RenderPageWithFlagsDeprecated(page, saved_form_handle_, 0);
+ RenderPageWithFlagsDeprecated(saved_page, saved_form_handle_, 0);
const char last_md5[] = "4b5b00f824620f8c9b8801ebb98e1cdd";
CompareBitmap(new_bitmap, 612, 792, last_md5);
FPDFBitmap_Destroy(new_bitmap);
- EXPECT_TRUE(FPDFPage_GenerateContent(page));
+ EXPECT_TRUE(FPDFPage_GenerateContent(saved_page));
// Now save the result, closing the page and document
EXPECT_TRUE(FPDF_SaveAsCopy(saved_document_, this, 0));
- CloseSavedPage(page);
+ CloseSavedPage(saved_page);
CloseSavedDocument();
// Render the saved result
@@ -500,9 +511,12 @@ TEST_F(FPDFEditEmbeddertest, AddStrokedPaths) {
EXPECT_TRUE(FPDFPath_SetStrokeWidth(rect, 15.0f));
EXPECT_TRUE(FPDFPath_SetDrawMode(rect, 0, 1));
FPDFPage_InsertObject(page, rect);
- FPDF_BITMAP page_bitmap = RenderPageDeprecated(page);
- CompareBitmap(page_bitmap, 612, 792, "64bd31f862a89e0a9e505a5af6efd506");
- FPDFBitmap_Destroy(page_bitmap);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ CompareBitmap(page_bitmap.get(), 612, 792,
+ "64bd31f862a89e0a9e505a5af6efd506");
+ }
// Add crossed-checkmark
FPDF_PAGEOBJECT check = FPDFPageObj_CreateNewPath(300, 500);
@@ -514,9 +528,12 @@ TEST_F(FPDFEditEmbeddertest, AddStrokedPaths) {
EXPECT_TRUE(FPDFPath_SetStrokeWidth(check, 8.35f));
EXPECT_TRUE(FPDFPath_SetDrawMode(check, 0, 1));
FPDFPage_InsertObject(page, check);
- page_bitmap = RenderPageDeprecated(page);
- CompareBitmap(page_bitmap, 612, 792, "4b6f3b9d25c4e194821217d5016c3724");
- FPDFBitmap_Destroy(page_bitmap);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ CompareBitmap(page_bitmap.get(), 612, 792,
+ "4b6f3b9d25c4e194821217d5016c3724");
+ }
// Add stroked and filled oval-ish path.
FPDF_PAGEOBJECT path = FPDFPageObj_CreateNewPath(250, 100);
@@ -529,9 +546,12 @@ TEST_F(FPDFEditEmbeddertest, AddStrokedPaths) {
EXPECT_TRUE(FPDFPath_SetStrokeWidth(path, 10.5f));
EXPECT_TRUE(FPDFPath_SetDrawMode(path, FPDF_FILLMODE_ALTERNATE, 1));
FPDFPage_InsertObject(page, path);
- page_bitmap = RenderPageDeprecated(page);
- CompareBitmap(page_bitmap, 612, 792, "ff3e6a22326754944cc6e56609acd73b");
- FPDFBitmap_Destroy(page_bitmap);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ CompareBitmap(page_bitmap.get(), 612, 792,
+ "ff3e6a22326754944cc6e56609acd73b");
+ }
FPDF_ClosePage(page);
}
@@ -548,14 +568,16 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) {
EXPECT_TRUE(FPDFText_SetText(text_object1, text1.get()));
FPDFPageObj_Transform(text_object1, 1, 0, 0, 1, 20, 20);
FPDFPage_InsertObject(page, text_object1);
- FPDF_BITMAP page_bitmap = RenderPageDeprecated(page);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
- const char md5[] = "a4dddc1a3930fa694bbff9789dab4161";
+ const char md5[] = "a4dddc1a3930fa694bbff9789dab4161";
#else
- const char md5[] = "eacaa24573b8ce997b3882595f096f00";
+ const char md5[] = "eacaa24573b8ce997b3882595f096f00";
#endif
- CompareBitmap(page_bitmap, 612, 792, md5);
- FPDFBitmap_Destroy(page_bitmap);
+ CompareBitmap(page_bitmap.get(), 612, 792, md5);
+ }
// Try another font
FPDF_PAGEOBJECT text_object2 =
@@ -566,7 +588,9 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) {
EXPECT_TRUE(FPDFText_SetText(text_object2, text2.get()));
FPDFPageObj_Transform(text_object2, 1, 0, 0, 1, 100, 600);
FPDFPage_InsertObject(page, text_object2);
- page_bitmap = RenderPageDeprecated(page);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
const char md5_2[] = "a5c4ace4c6f27644094813fe1441a21c";
#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
@@ -574,8 +598,8 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) {
#else
const char md5_2[] = "76fcc7d08aa15445efd2e2ceb7c6cc3b";
#endif
- CompareBitmap(page_bitmap, 612, 792, md5_2);
- FPDFBitmap_Destroy(page_bitmap);
+ CompareBitmap(page_bitmap.get(), 612, 792, md5_2);
+ }
// And some randomly transformed text
FPDF_PAGEOBJECT text_object3 =
@@ -586,16 +610,18 @@ TEST_F(FPDFEditEmbeddertest, AddStandardFontText) {
EXPECT_TRUE(FPDFText_SetText(text_object3, text3.get()));
FPDFPageObj_Transform(text_object3, 1, 1.5, 2, 0.5, 200, 200);
FPDFPage_InsertObject(page, text_object3);
- page_bitmap = RenderPageDeprecated(page);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
- const char md5_3[] = "40b3ef04f915ff4c4208948001763544";
+ const char md5_3[] = "40b3ef04f915ff4c4208948001763544";
#elif _FX_PLATFORM_ == _FX_PLATFORM_WINDOWS_
- const char md5_3[] = "7cb61ec112cf400b489360d443ffc9d2";
+ const char md5_3[] = "7cb61ec112cf400b489360d443ffc9d2";
#else
- const char md5_3[] = "b8a21668f1dab625af7c072e07fcefc4";
+ const char md5_3[] = "b8a21668f1dab625af7c072e07fcefc4";
#endif
- CompareBitmap(page_bitmap, 612, 792, md5_3);
- FPDFBitmap_Destroy(page_bitmap);
+ CompareBitmap(page_bitmap.get(), 612, 792, md5_3);
+ }
// TODO(npm): Why are there issues with text rotated by 90 degrees?
// TODO(npm): FPDF_SaveAsCopy not giving the desired result after this.
@@ -614,9 +640,8 @@ TEST_F(FPDFEditEmbeddertest, GraphicsData) {
EXPECT_TRUE(FPDFPage_GenerateContent(page.get()));
// Check that the ExtGState was created
- CPDF_Page* the_page = CPDFPageFromFPDFPage(page.get());
- CPDF_Dictionary* graphics_dict =
- the_page->m_pResources->GetDictFor("ExtGState");
+ CPDF_Page* cpage = CPDFPageFromFPDFPage(page.get());
+ CPDF_Dictionary* graphics_dict = cpage->m_pResources->GetDictFor("ExtGState");
ASSERT_TRUE(graphics_dict);
EXPECT_EQ(2, static_cast<int>(graphics_dict->GetCount()));
@@ -668,16 +693,18 @@ TEST_F(FPDFEditEmbeddertest, DoubleGenerating) {
EXPECT_TRUE(FPDFPage_GenerateContent(page));
// Check the ExtGState
- CPDF_Page* the_page = CPDFPageFromFPDFPage(page);
- CPDF_Dictionary* graphics_dict =
- the_page->m_pResources->GetDictFor("ExtGState");
+ CPDF_Page* cpage = CPDFPageFromFPDFPage(page);
+ CPDF_Dictionary* graphics_dict = cpage->m_pResources->GetDictFor("ExtGState");
ASSERT_TRUE(graphics_dict);
EXPECT_EQ(2, static_cast<int>(graphics_dict->GetCount()));
// Check the bitmap
- FPDF_BITMAP page_bitmap = RenderPageDeprecated(page);
- CompareBitmap(page_bitmap, 612, 792, "5384da3406d62360ffb5cac4476fff1c");
- FPDFBitmap_Destroy(page_bitmap);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ CompareBitmap(page_bitmap.get(), 612, 792,
+ "5384da3406d62360ffb5cac4476fff1c");
+ }
// Never mind, my new favorite color is blue, increase alpha
EXPECT_TRUE(FPDFPath_SetFillColor(rect, 0, 0, 255, 180));
@@ -685,16 +712,22 @@ TEST_F(FPDFEditEmbeddertest, DoubleGenerating) {
EXPECT_EQ(3, static_cast<int>(graphics_dict->GetCount()));
// Check that bitmap displays changed content
- page_bitmap = RenderPageDeprecated(page);
- CompareBitmap(page_bitmap, 612, 792, "2e51656f5073b0bee611d9cd086aa09c");
- FPDFBitmap_Destroy(page_bitmap);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ CompareBitmap(page_bitmap.get(), 612, 792,
+ "2e51656f5073b0bee611d9cd086aa09c");
+ }
// And now generate, without changes
EXPECT_TRUE(FPDFPage_GenerateContent(page));
EXPECT_EQ(3, static_cast<int>(graphics_dict->GetCount()));
- page_bitmap = RenderPageDeprecated(page);
- CompareBitmap(page_bitmap, 612, 792, "2e51656f5073b0bee611d9cd086aa09c");
- FPDFBitmap_Destroy(page_bitmap);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ CompareBitmap(page_bitmap.get(), 612, 792,
+ "2e51656f5073b0bee611d9cd086aa09c");
+ }
// Add some text to the page
FPDF_PAGEOBJECT text_object =
@@ -705,7 +738,7 @@ TEST_F(FPDFEditEmbeddertest, DoubleGenerating) {
FPDFPageObj_Transform(text_object, 1, 0, 0, 1, 300, 300);
FPDFPage_InsertObject(page, text_object);
EXPECT_TRUE(FPDFPage_GenerateContent(page));
- CPDF_Dictionary* font_dict = the_page->m_pResources->GetDictFor("Font");
+ CPDF_Dictionary* font_dict = cpage->m_pResources->GetDictFor("Font");
ASSERT_TRUE(font_dict);
EXPECT_EQ(1, static_cast<int>(font_dict->GetCount()));
@@ -889,14 +922,14 @@ TEST_F(FPDFEditEmbeddertest, AddTrueTypeFontText) {
EXPECT_TRUE(FPDFText_SetText(text_object, text.get()));
FPDFPageObj_Transform(text_object, 1, 0, 0, 1, 400, 400);
FPDFPage_InsertObject(page, text_object);
- FPDF_BITMAP page_bitmap = RenderPageDeprecated(page);
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
const char md5[] = "17d2b6cd574cf66170b09c8927529a94";
#else
const char md5[] = "70592859010ffbf532a2237b8118bcc4";
#endif // _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
- CompareBitmap(page_bitmap, 612, 792, md5);
- FPDFBitmap_Destroy(page_bitmap);
+ CompareBitmap(page_bitmap.get(), 612, 792, md5);
// Add some more text, same font
FPDF_PAGEOBJECT text_object2 =
@@ -907,14 +940,14 @@ TEST_F(FPDFEditEmbeddertest, AddTrueTypeFontText) {
FPDFPageObj_Transform(text_object2, 1, 0, 0, 1, 200, 200);
FPDFPage_InsertObject(page, text_object2);
}
- FPDF_BITMAP page_bitmap2 = RenderPageDeprecated(page);
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap2 =
+ RenderPageWithFlags(page, nullptr, 0);
#if _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
const char md5_2[] = "8eded4193ff1f0f77b8b600a825e97ea";
#else
const char md5_2[] = "c1d10cce1761c4a998a16b2562030568";
#endif // _FX_PLATFORM_ == _FX_PLATFORM_APPLE_
- CompareBitmap(page_bitmap2, 612, 792, md5_2);
- FPDFBitmap_Destroy(page_bitmap2);
+ CompareBitmap(page_bitmap2.get(), 612, 792, md5_2);
EXPECT_TRUE(FPDFPage_GenerateContent(page));
EXPECT_TRUE(FPDF_SaveAsCopy(document(), this, 0));
@@ -986,10 +1019,12 @@ TEST_F(FPDFEditEmbeddertest, AddCIDFontText) {
}
// Check that the text renders properly.
- FPDF_BITMAP page_bitmap = RenderPageDeprecated(page);
const char md5[] = "c68cd79aa72bf83a7b25271370d46b21";
- CompareBitmap(page_bitmap, 612, 792, md5);
- FPDFBitmap_Destroy(page_bitmap);
+ {
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ CompareBitmap(page_bitmap.get(), 612, 792, md5);
+ }
// Save the document, close the page.
EXPECT_TRUE(FPDFPage_GenerateContent(page));
@@ -1019,9 +1054,9 @@ TEST_F(FPDFEditEmbeddertest, SaveAndRender) {
EXPECT_TRUE(FPDFPath_BezierTo(green_path, 38, 33, 39, 36, 40, 40));
EXPECT_TRUE(FPDFPath_Close(green_path));
FPDFPage_InsertObject(page, green_path);
- FPDF_BITMAP page_bitmap = RenderPageDeprecated(page);
- CompareBitmap(page_bitmap, 612, 792, md5);
- FPDFBitmap_Destroy(page_bitmap);
+ std::unique_ptr<void, FPDFBitmapDeleter> page_bitmap =
+ RenderLoadedPage(page);
+ CompareBitmap(page_bitmap.get(), 612, 792, md5);
// Now save the result, closing the page and document
EXPECT_TRUE(FPDFPage_GenerateContent(page));
diff --git a/fpdfsdk/fpdfppo_embeddertest.cpp b/fpdfsdk/fpdfppo_embeddertest.cpp
index 4e7b2ae82e..f62ca52048 100644
--- a/fpdfsdk/fpdfppo_embeddertest.cpp
+++ b/fpdfsdk/fpdfppo_embeddertest.cpp
@@ -215,17 +215,15 @@ TEST_F(FPDFPPOEmbeddertest, BUG_750568) {
for (size_t i = 0; i < 4; ++i) {
FPDF_PAGE page = LoadPage(i);
- ASSERT_NE(nullptr, page);
+ ASSERT_TRUE(page);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
- ASSERT_EQ(200, FPDFBitmap_GetWidth(bitmap));
- ASSERT_EQ(200, FPDFBitmap_GetHeight(bitmap));
- ASSERT_EQ(800, FPDFBitmap_GetStride(bitmap));
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
+ ASSERT_EQ(200, FPDFBitmap_GetWidth(bitmap.get()));
+ ASSERT_EQ(200, FPDFBitmap_GetHeight(bitmap.get()));
+ ASSERT_EQ(800, FPDFBitmap_GetStride(bitmap.get()));
- std::string digest = HashBitmap(bitmap);
- FPDFBitmap_Destroy(bitmap);
+ EXPECT_EQ(kHashes[i], HashBitmap(bitmap.get()));
UnloadPage(page);
- EXPECT_EQ(kHashes[i], digest);
}
FPDF_DOCUMENT output_doc = FPDF_CreateNewDocument();
@@ -234,17 +232,16 @@ TEST_F(FPDFPPOEmbeddertest, BUG_750568) {
ASSERT_EQ(4, FPDF_GetPageCount(output_doc));
for (size_t i = 0; i < 4; ++i) {
FPDF_PAGE page = FPDF_LoadPage(output_doc, i);
- ASSERT_NE(nullptr, page);
+ ASSERT_TRUE(page);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
- ASSERT_EQ(200, FPDFBitmap_GetWidth(bitmap));
- ASSERT_EQ(200, FPDFBitmap_GetHeight(bitmap));
- ASSERT_EQ(800, FPDFBitmap_GetStride(bitmap));
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap =
+ RenderPageWithFlags(page, nullptr, 0);
+ ASSERT_EQ(200, FPDFBitmap_GetWidth(bitmap.get()));
+ ASSERT_EQ(200, FPDFBitmap_GetHeight(bitmap.get()));
+ ASSERT_EQ(800, FPDFBitmap_GetStride(bitmap.get()));
- std::string digest = HashBitmap(bitmap);
- FPDFBitmap_Destroy(bitmap);
+ EXPECT_EQ(kHashes[i], HashBitmap(bitmap.get()));
FPDF_ClosePage(page);
- EXPECT_EQ(kHashes[i], digest);
}
FPDF_CloseDocument(output_doc);
}
@@ -252,15 +249,14 @@ TEST_F(FPDFPPOEmbeddertest, BUG_750568) {
TEST_F(FPDFPPOEmbeddertest, ImportWithZeroLengthStream) {
EXPECT_TRUE(OpenDocument("zero_length_stream.pdf"));
FPDF_PAGE page = LoadPage(0);
- ASSERT_NE(nullptr, page);
+ ASSERT_TRUE(page);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
- ASSERT_EQ(200, FPDFBitmap_GetWidth(bitmap));
- ASSERT_EQ(200, FPDFBitmap_GetHeight(bitmap));
- ASSERT_EQ(800, FPDFBitmap_GetStride(bitmap));
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
+ ASSERT_EQ(200, FPDFBitmap_GetWidth(bitmap.get()));
+ ASSERT_EQ(200, FPDFBitmap_GetHeight(bitmap.get()));
+ ASSERT_EQ(800, FPDFBitmap_GetStride(bitmap.get()));
- std::string digest = HashBitmap(bitmap);
- FPDFBitmap_Destroy(bitmap);
+ std::string digest = HashBitmap(bitmap.get());
UnloadPage(page);
FPDF_DOCUMENT new_doc = FPDF_CreateNewDocument();
@@ -270,15 +266,13 @@ TEST_F(FPDFPPOEmbeddertest, ImportWithZeroLengthStream) {
EXPECT_EQ(1, FPDF_GetPageCount(new_doc));
FPDF_PAGE new_page = FPDF_LoadPage(new_doc, 0);
ASSERT_NE(nullptr, new_page);
- FPDF_BITMAP new_bitmap = RenderPageDeprecated(new_page);
- ASSERT_EQ(200, FPDFBitmap_GetWidth(new_bitmap));
- ASSERT_EQ(200, FPDFBitmap_GetHeight(new_bitmap));
- ASSERT_EQ(800, FPDFBitmap_GetStride(new_bitmap));
+ std::unique_ptr<void, FPDFBitmapDeleter> new_bitmap =
+ RenderPageWithFlags(new_page, nullptr, 0);
+ ASSERT_EQ(200, FPDFBitmap_GetWidth(new_bitmap.get()));
+ ASSERT_EQ(200, FPDFBitmap_GetHeight(new_bitmap.get()));
+ ASSERT_EQ(800, FPDFBitmap_GetStride(new_bitmap.get()));
- std::string new_digest = HashBitmap(new_bitmap);
- FPDFBitmap_Destroy(new_bitmap);
+ EXPECT_EQ(digest, HashBitmap(new_bitmap.get()));
FPDF_ClosePage(new_page);
FPDF_CloseDocument(new_doc);
-
- EXPECT_EQ(digest, new_digest);
}
diff --git a/fpdfsdk/fpdfview_embeddertest.cpp b/fpdfsdk/fpdfview_embeddertest.cpp
index c46b3bd14f..ab7606479d 100644
--- a/fpdfsdk/fpdfview_embeddertest.cpp
+++ b/fpdfsdk/fpdfview_embeddertest.cpp
@@ -4,6 +4,7 @@
#include <cmath>
#include <limits>
+#include <memory>
#include <string>
#include "fpdfsdk/fpdfview_c_api_test.h"
@@ -423,20 +424,19 @@ TEST_F(FPDFViewEmbeddertest, FPDF_RenderPageBitmapWithMatrix) {
EXPECT_TRUE(OpenDocument("rectangles.pdf"));
FPDF_PAGE page = LoadPage(0);
- EXPECT_NE(nullptr, page);
+ ASSERT_TRUE(page);
const int page_width = static_cast<int>(FPDF_GetPageWidth(page));
const int page_height = static_cast<int>(FPDF_GetPageHeight(page));
EXPECT_EQ(200, page_width);
EXPECT_EQ(300, page_height);
- FPDF_BITMAP bitmap = RenderPageDeprecated(page);
- CompareBitmap(bitmap, page_width, page_height, kOriginalMD5);
- FPDFBitmap_Destroy(bitmap);
+ std::unique_ptr<void, FPDFBitmapDeleter> bitmap = RenderLoadedPage(page);
+ CompareBitmap(bitmap.get(), page_width, page_height, kOriginalMD5);
FS_RECTF page_rect{0, 0, page_width, page_height};
// Try rendering with an identity matrix. The output should be the same as
- // the RenderPageDeprecated() output.
+ // the RenderLoadedPage() output.
FS_MATRIX identity_matrix{1, 0, 0, 1, 0, 0};
TestRenderPageBitmapWithMatrix(page, page_width, page_height, identity_matrix,
page_rect, kOriginalMD5);
diff --git a/testing/embedder_test.cpp b/testing/embedder_test.cpp
index e49f289948..549ebe1f80 100644
--- a/testing/embedder_test.cpp
+++ b/testing/embedder_test.cpp
@@ -282,10 +282,6 @@ void EmbedderTest::UnloadPage(FPDF_PAGE page) {
page_map_.erase(page_number);
}
-FPDF_BITMAP EmbedderTest::RenderPageDeprecated(FPDF_PAGE page) {
- return RenderPageWithFlagsDeprecated(page, form_handle_, 0);
-}
-
std::unique_ptr<void, FPDFBitmapDeleter> EmbedderTest::RenderLoadedPage(
FPDF_PAGE page) {
return RenderLoadedPageWithFlags(page, 0);
diff --git a/testing/embedder_test.h b/testing/embedder_test.h
index 25896dcafc..dc91df8bf3 100644
--- a/testing/embedder_test.h
+++ b/testing/embedder_test.h
@@ -119,10 +119,6 @@ class EmbedderTest : public ::testing::Test,
// from LoadPage(). Further use of |page| is prohibited after calling this.
void UnloadPage(FPDF_PAGE page);
- // Convert a loaded page into a bitmap.
- // DEPRECATED. Use some one of the methods below instead.
- FPDF_BITMAP RenderPageDeprecated(FPDF_PAGE page);
-
// RenderLoadedPageWithFlags() with no flags.
std::unique_ptr<void, FPDFBitmapDeleter> RenderLoadedPage(FPDF_PAGE page);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 21:05:11 +0000