summaryrefslogtreecommitdiff
path: root/samples/pdfium_test.cc
diff options
context:
space:
mode:
authorJane Liu <janeliulwq@google.com>2017-06-26 11:28:36 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-06-27 18:13:48 +0000
commitd60e9ad5194e13475ccb21575a7c57de1e2e22c4 (patch)
tree040f7bcade94671b71e5148f716e18416cd06558 /samples/pdfium_test.cc
parent22eb7ae54e4351f70a5a01b0130c8b0dc713586c (diff)
downloadpdfium-d60e9ad5194e13475ccb21575a7c57de1e2e22c4.tar.xz
Changed the return type for annotation APIs
Before: When returning FPDF_ANNOTATION, the APIs would take in a FPDF_ANNTOATION* and write the handle of the annotation to it, while returning a boolean as status. This CL: This CL changes the APIs to directly return FPDF_ANNOTATION, which would be null on failure. Also adds more null checks within the annotation APIs. Bug=pdfium:737 Change-Id: I4f77dd1b16d43eab3f16c303598b76591da0dcab Reviewed-on: https://pdfium-review.googlesource.com/6952 Reviewed-by: dsinclair <dsinclair@chromium.org> Commit-Queue: Jane Liu <janeliulwq@google.com>
Diffstat (limited to 'samples/pdfium_test.cc')
-rw-r--r--samples/pdfium_test.cc26
1 files changed, 9 insertions, 17 deletions
diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc
index ccd57a7e6a..5a3668f6ce 100644
--- a/samples/pdfium_test.cc
+++ b/samples/pdfium_test.cc
@@ -277,8 +277,8 @@ void WriteAnnot(FPDF_PAGE page, const char* pdf_name, int num) {
for (int i = 0; i < annot_count; i++) {
// Retrieve the annotation object and its subtype.
fprintf(fp, "Annotation #%d:\n", i + 1);
- FPDF_ANNOTATION annot;
- if (!FPDFPage_GetAnnot(page, i, &annot)) {
+ FPDF_ANNOTATION annot = FPDFPage_GetAnnot(page, i);
+ if (!annot) {
fprintf(fp, "Failed to retrieve annotation!\n\n");
continue;
}
@@ -319,25 +319,17 @@ void WriteAnnot(FPDF_PAGE page, const char* pdf_name, int num) {
.c_str());
// Retrieve the annotation's quadpoints if it is a markup annotation.
- FS_QUADPOINTSF quadpoints;
if (FPDFAnnot_HasAttachmentPoints(annot)) {
- if (!FPDFAnnot_GetAttachmentPoints(annot, &quadpoints)) {
- fprintf(fp, "Failed to retrieve quadpoints.\n");
- } else {
- fprintf(fp, "Quadpoints: (%f, %f), (%f, %f), (%f, %f), (%f, %f)\n",
- quadpoints.x1, quadpoints.y1, quadpoints.x2, quadpoints.y2,
- quadpoints.x3, quadpoints.y3, quadpoints.x4, quadpoints.y4);
- }
+ FS_QUADPOINTSF quadpoints = FPDFAnnot_GetAttachmentPoints(annot);
+ fprintf(fp, "Quadpoints: (%f, %f), (%f, %f), (%f, %f), (%f, %f)\n",
+ quadpoints.x1, quadpoints.y1, quadpoints.x2, quadpoints.y2,
+ quadpoints.x3, quadpoints.y3, quadpoints.x4, quadpoints.y4);
}
// Retrieve the annotation's rectangle coordinates.
- FS_RECTF rect;
- if (!FPDFAnnot_GetRect(annot, &rect)) {
- fprintf(fp, "Failed to retrieve rectangle.\n\n");
- } else {
- fprintf(fp, "Rectangle: l - %f, b - %f, r - %f, t - %f\n\n", rect.left,
- rect.bottom, rect.right, rect.top);
- }
+ FS_RECTF rect = FPDFAnnot_GetRect(annot);
+ fprintf(fp, "Rectangle: l - %f, b - %f, r - %f, t - %f\n\n", rect.left,
+ rect.bottom, rect.right, rect.top);
}
(void)fclose(fp);