1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
|
From 09ecef60e8292457d9e78a2242f5efec953c2c25 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 10 Nov 2020 21:50:38 +0000
Subject: [PATCH] Add FPDFAnnot_GetVertices() API
This follows the same pattern as FPDF_GetTrailerEnds(), so the client
has to call this function twice, but allocation of the buffer happens
outside pdfium.
Change-Id: Ic733083eba0b110310d6bbdc48f874bac4c7f2d6
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/76050
Commit-Queue: Miklos V <vmiklos@collabora.co.uk>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
---
constants/annotation_common.h | 3 ++
fpdfsdk/fpdf_annot.cpp | 28 ++++++++++++
fpdfsdk/fpdf_annot_embeddertest.cpp | 67 +++++++++++++++++++++++++++++
fpdfsdk/fpdf_view_c_api_test.c | 1 +
public/fpdf_annot.h | 16 +++++++
testing/resources/polygon_annot.in | 48 +++++++++++++++++++++
testing/resources/polygon_annot.pdf | 60 ++++++++++++++++++++++++++
7 files changed, 223 insertions(+)
create mode 100644 testing/resources/polygon_annot.in
create mode 100644 testing/resources/polygon_annot.pdf
diff --git a/constants/annotation_common.h b/constants/annotation_common.h
index 471d24407..6f96e623a 100644
--- a/constants/annotation_common.h
+++ b/constants/annotation_common.h
@@ -26,6 +26,9 @@ constexpr char kC[] = "C";
constexpr char kStructParent[] = "StructParent";
constexpr char kOC[] = "OC";
+// Entries for polygon and polyline annotations.
+constexpr char kVertices[] = "Vertices";
+
} // namespace annotation
} // namespace pdfium
diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp
index 28dbe145d..13c73f6aa 100644
--- a/fpdfsdk/fpdf_annot.cpp
+++ b/fpdfsdk/fpdf_annot.cpp
@@ -809,6 +809,34 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_GetRect(FPDF_ANNOTATION annot,
return true;
}
+FPDF_EXPORT unsigned long FPDF_CALLCONV
+FPDFAnnot_GetVertices(FPDF_ANNOTATION annot,
+ FS_POINTF* buffer,
+ unsigned long length) {
+ FPDF_ANNOTATION_SUBTYPE subtype = FPDFAnnot_GetSubtype(annot);
+ if (subtype != FPDF_ANNOT_POLYGON && subtype != FPDF_ANNOT_POLYLINE)
+ return 0;
+
+ CPDF_Dictionary* annot_dict = GetAnnotDictFromFPDFAnnotation(annot);
+ if (!annot_dict)
+ return 0;
+
+ CPDF_Array* vertices = annot_dict->GetArrayFor(pdfium::annotation::kVertices);
+ if (!vertices)
+ return 0;
+
+ // Truncate to an even number.
+ unsigned long points_len = vertices->size() / 2;
+ if (buffer && length >= points_len) {
+ for (unsigned long i = 0; i < points_len; ++i) {
+ buffer[i].x = vertices->GetNumberAt(i * 2);
+ buffer[i].y = vertices->GetNumberAt(i * 2 + 1);
+ }
+ }
+
+ return points_len;
+}
+
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_HasKey(FPDF_ANNOTATION annot,
FPDF_BYTESTRING key) {
CPDF_Dictionary* pAnnotDict = GetAnnotDictFromFPDFAnnotation(annot);
diff --git a/public/fpdf_annot.h b/public/fpdf_annot.h
index 93064561b..7159602db 100644
--- a/public/fpdf_annot.h
+++ b/public/fpdf_annot.h
@@ -395,6 +395,22 @@ FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_SetRect(FPDF_ANNOTATION annot,
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_GetRect(FPDF_ANNOTATION annot,
FS_RECTF* rect);
+// Experimental API.
+// Get the vertices of a polygon or polyline annotation. |buffer| is an array of
+// points of the annotation. If |length| is less than the returned length, or
+// |annot| or |buffer| is NULL, |buffer| will not be modified.
+//
+// annot - handle to an annotation, as returned by e.g. FPDFPage_GetAnnot()
+// buffer - buffer for holding the points.
+// length - length of the buffer in points.
+//
+// Returns the number of points if the annotation is of type polygon or
+// polyline, 0 otherwise.
+FPDF_EXPORT unsigned long FPDF_CALLCONV
+FPDFAnnot_GetVertices(FPDF_ANNOTATION annot,
+ FS_POINTF* buffer,
+ unsigned long length);
+
// Experimental API.
// Check if |annot|'s dictionary has |key| as a key.
//
--
2.26.2
From 8f7b1aed53e31eda9870146cb97602f03a8f23c4 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 17 Nov 2020 16:53:14 +0000
Subject: [PATCH] Add FPDFAnnot_GetInkListPath() API
This is somewhat similar to FPDFAnnot_GetVertices(), but this is for ink
annotations and here the value is an array of paths.
So first add an FPDFAnnot_GetInkListCount() to get the number of paths,
then FPDFAnnot_GetInkListPath() can be used to get the individual paths.
Change-Id: I204a5a53e949fdbb7b264711c27107fe62c9f2be
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/76350
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
---
constants/annotation_common.h | 3 +
fpdfsdk/fpdf_annot.cpp | 50 ++++++++++++++++
fpdfsdk/fpdf_annot_embeddertest.cpp | 91 ++++++++++++++++++++++++++++-
fpdfsdk/fpdf_view_c_api_test.c | 2 +
public/fpdf_annot.h | 28 +++++++++
testing/resources/ink_annot.in | 48 +++++++++++++++
testing/resources/ink_annot.pdf | 60 +++++++++++++++++++
7 files changed, 281 insertions(+), 1 deletion(-)
create mode 100644 testing/resources/ink_annot.in
create mode 100644 testing/resources/ink_annot.pdf
diff --git a/constants/annotation_common.h b/constants/annotation_common.h
index 6f96e623a..be6420651 100644
--- a/constants/annotation_common.h
+++ b/constants/annotation_common.h
@@ -29,6 +29,9 @@ constexpr char kOC[] = "OC";
// Entries for polygon and polyline annotations.
constexpr char kVertices[] = "Vertices";
+// Entries for ink annotations
+constexpr char kInkList[] = "InkList";
+
} // namespace annotation
} // namespace pdfium
diff --git a/fpdfsdk/fpdf_annot.cpp b/fpdfsdk/fpdf_annot.cpp
index 13c73f6aa..51b4332c2 100644
--- a/fpdfsdk/fpdf_annot.cpp
+++ b/fpdfsdk/fpdf_annot.cpp
@@ -296,6 +296,18 @@ CPDFSDK_Widget* GetRadioButtonOrCheckBoxWidget(FPDF_FORMHANDLE hHandle,
return pFormControl ? pForm->GetWidget(pFormControl) : nullptr;
}
+CPDF_Array* GetInkList(FPDF_ANNOTATION annot) {
+ FPDF_ANNOTATION_SUBTYPE subtype = FPDFAnnot_GetSubtype(annot);
+ if (subtype != FPDF_ANNOT_INK)
+ return 0;
+
+ CPDF_Dictionary* annot_dict = GetAnnotDictFromFPDFAnnotation(annot);
+ if (!annot_dict)
+ return 0;
+
+ return annot_dict->GetArrayFor(pdfium::annotation::kInkList);
+}
+
} // namespace
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV
@@ -837,6 +849,44 @@ FPDFAnnot_GetVertices(FPDF_ANNOTATION annot,
return points_len;
}
+FPDF_EXPORT unsigned long FPDF_CALLCONV
+FPDFAnnot_GetInkListCount(FPDF_ANNOTATION annot) {
+ CPDF_Array* ink_list = GetInkList(annot);
+ if (!ink_list)
+ return 0;
+
+ return ink_list->size();
+}
+
+FPDF_EXPORT unsigned long FPDF_CALLCONV
+FPDFAnnot_GetInkListPath(FPDF_ANNOTATION annot,
+ unsigned long path_index,
+ FS_POINTF* buffer,
+ unsigned long length) {
+ unsigned long path_count = FPDFAnnot_GetInkListCount(annot);
+ if (path_index >= path_count)
+ return 0;
+
+ CPDF_Array* ink_list = GetInkList(annot);
+ if (!ink_list)
+ return 0;
+
+ CPDF_Array* path = ink_list->GetArrayAt(path_index);
+ if (!path)
+ return 0;
+
+ // Truncate to an even number.
+ unsigned long points_len = path->size() / 2;
+ if (buffer && length >= points_len) {
+ for (unsigned long i = 0; i < points_len; ++i) {
+ buffer[i].x = path->GetNumberAt(i * 2);
+ buffer[i].y = path->GetNumberAt(i * 2 + 1);
+ }
+ }
+
+ return points_len;
+}
+
FPDF_EXPORT FPDF_BOOL FPDF_CALLCONV FPDFAnnot_HasKey(FPDF_ANNOTATION annot,
FPDF_BYTESTRING key) {
CPDF_Dictionary* pAnnotDict = GetAnnotDictFromFPDFAnnotation(annot);
diff --git a/public/fpdf_annot.h b/public/fpdf_annot.h
index 7159602db..d121344f7 100644
--- a/public/fpdf_annot.h
+++ b/public/fpdf_annot.h
@@ -411,6 +411,34 @@ FPDFAnnot_GetVertices(FPDF_ANNOTATION annot,
FS_POINTF* buffer,
unsigned long length);
+// Experimental API.
+// Get the number of paths in the ink list of an ink annotation.
+//
+// annot - handle to an annotation, as returned by e.g. FPDFPage_GetAnnot()
+//
+// Returns the number of paths in the ink list if the annotation is of type ink,
+// 0 otherwise.
+FPDF_EXPORT unsigned long FPDF_CALLCONV
+FPDFAnnot_GetInkListCount(FPDF_ANNOTATION annot);
+
+// Experimental API.
+// Get a path in the ink list of an ink annotation. |buffer| is an array of
+// points of the path. If |length| is less than the returned length, or |annot|
+// or |buffer| is NULL, |buffer| will not be modified.
+//
+// annot - handle to an annotation, as returned by e.g. FPDFPage_GetAnnot()
+// path_index - index of the path
+// buffer - buffer for holding the points.
+// length - length of the buffer in points.
+//
+// Returns the number of points of the path if the annotation is of type ink, 0
+// otherwise.
+FPDF_EXPORT unsigned long FPDF_CALLCONV
+FPDFAnnot_GetInkListPath(FPDF_ANNOTATION annot,
+ unsigned long path_index,
+ FS_POINTF* buffer,
+ unsigned long length);
+
// Experimental API.
// Check if |annot|'s dictionary has |key| as a key.
//
--
2.26.2
|
