octoleo/qpdf
2
1
Fork 0
mirror of https://github.com/qpdf/qpdf.git synced 2024-12-22 19:08:59 +00:00
Code Issues Releases Wiki Activity

C-API add two binary UTF8 funtions

Browse Source 
add qpdf_oh_new_binary_unicode_string and qpdf_oh_get_binary_utf8_value
This commit is contained in:
m-holger 2022-02-04 17:15:34 +00:00 committed by Jay Berkenbilt
parent 3c138be0ef
commit 95e7d36b7a
5 changed files with 60 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/qpdf/qpdf-c.h
View File

@ -742,6 +742,9 @@ extern "C" {
QPDF_DLL
char const* qpdf_oh_get_binary_string_value(
qpdf_data qpdf, qpdf_oh oh, size_t* length);
QPDF_DLL
char const* qpdf_oh_get_binary_utf8_value(
qpdf_data qpdf, qpdf_oh oh, size_t* length);
QPDF_DLL
int qpdf_oh_get_array_n_items(qpdf_data qpdf, qpdf_oh oh);
@ -800,6 +803,9 @@ extern "C" {
QPDF_DLL
qpdf_oh qpdf_oh_new_binary_string(
qpdf_data qpdf, char const* str, size_t length);
QPDF_DLL
qpdf_oh qpdf_oh_new_binary_unicode_string(
qpdf_data qpdf, char const* str, size_t length);
QPDF_DLL
qpdf_oh qpdf_oh_new_array(qpdf_data qpdf);
QPDF_DLL

22
libqpdf/qpdf-c.cc
View File

@ -1327,6 +1327,20 @@ char const* qpdf_oh_get_binary_string_value(
});
}
char const* qpdf_oh_get_binary_utf8_value(
qpdf_data qpdf, qpdf_oh oh, size_t* length)
{
return do_with_oh<char const*>(
qpdf, oh,
return_T<char const*>(""),
[qpdf, length](QPDFObjectHandle& o) {
QTC::TC("qpdf", "qpdf-c called qpdf_oh_get_binary_utf8_value");
qpdf->tmp_string = o.getUTF8Value();
*length = qpdf->tmp_string.length();
return qpdf->tmp_string.c_str();
});
}
int qpdf_oh_get_array_n_items(qpdf_data qpdf, qpdf_oh oh)
{
return do_with_oh<int>(
@ -1468,6 +1482,14 @@ qpdf_oh qpdf_oh_new_binary_string(
qpdf, QPDFObjectHandle::newString(std::string(str, length)));
}
qpdf_oh qpdf_oh_new_binary_unicode_string(
qpdf_data qpdf, char const* utf8_str, size_t length)
{
QTC::TC("qpdf", "qpdf-c called qpdf_oh_new_binary_unicode_string");
return new_object(
qpdf, QPDFObjectHandle::newUnicodeString(std::string(utf8_str, length)));
}
qpdf_oh qpdf_oh_new_array(qpdf_data qpdf)
{
QTC::TC("qpdf", "qpdf-c called qpdf_oh_new_array");

23
qpdf/qpdf-ctest.c
View File

@ -740,10 +740,13 @@ static void test25(char const* infile,
qpdf_oh_append_item(
qpdf, new_array,
qpdf_oh_new_unicode_string(qpdf, "qww\xc3\xb7\xcf\x80"));
qpdf_oh_append_item(
qpdf, new_array,
qpdf_oh_new_binary_unicode_string(qpdf, "qw\x00w\xc3\xb7\xcf\x80", 8));
qpdf_oh_append_item(qpdf, new_array, qpdf_oh_new_null(qpdf)); /* 2 */
qpdf_oh_append_item(qpdf, new_array, qpdf_oh_new_null(qpdf)); /* 3 */
qpdf_oh_set_array_item(
qpdf, new_array, 2,
qpdf, new_array, 3,
qpdf_oh_new_name(qpdf, "/Quack"));
qpdf_oh_append_item(
qpdf, new_array,
@ -803,6 +806,24 @@ static void test27(char const* infile,
"potato\000salad", 13) == 0);
assert(qpdf_get_last_string_length(qpdf) == 12);
assert(length == 12);
/* repeat for UTF8 string */
qpdf_oh p_utf8_string_with_null = qpdf_oh_parse(qpdf,
"<feff007100770000007700f703c0>");
assert(qpdf_oh_is_string(qpdf, p_utf8_string_with_null));
assert(strcmp(qpdf_oh_get_utf8_value(qpdf, p_utf8_string_with_null),
"qw\x00w\xc3\xb7\xcf\x80") == 0);
assert(qpdf_get_last_string_length(qpdf) == 8);
/* memcmp adds a character to verify the trailing null */
assert(memcmp(qpdf_oh_get_utf8_value(qpdf, p_utf8_string_with_null),
"qw\x00w\xc3\xb7\xcf\x80", 8) == 0);
p_utf8_string_with_null = qpdf_oh_new_binary_unicode_string(
qpdf, "qw\x00w\xc3\xb7\xcf\x80", 8);
/* memcmp adds a character to verify the trailing null */
assert(memcmp(qpdf_oh_get_binary_utf8_value(
qpdf, p_utf8_string_with_null, &length),
"qw\x00w\xc3\xb7\xcf\x80", 9) == 0);
assert(qpdf_get_last_string_length(qpdf) == 8);
assert(length == 8);
}
static void test28(char const* infile,

2
qpdf/qpdf.testcov
View File

@ -620,7 +620,9 @@ qpdf-c called qpdf_oh_get_page_content_data 0
qpdf-c called qpdf_oh_replace_stream_data 0
qpdf-c silence oh errors 0
qpdf-c called qpdf_oh_get_binary_string_value 0
qpdf-c called qpdf_oh_get_binary_utf8_value 0
qpdf-c called qpdf_oh_new_binary_string 0
qpdf-c called qpdf_oh_new_binary_unicode_string 0
QPDFJob duplicated pages password 0
QPDFJob misplaced pages password 0
QPDFJob check encrypted encrypted 0

15
qpdf/qtest/qpdf/c-object-handle-creation-out.pdf
View File

@ -9,6 +9,7 @@
/B [
(potato)
<feff00710077007700f703c0>
<feff007100770000007700f703c0>
/Quack
null
4.12
@ -95,17 +96,17 @@ xref
0 8
0000000000 65535 f
0000000025 00000 n
0000000277 00000 n
0000000359 00000 n
0000000574 00000 n
0000000673 00000 n
0000000692 00000 n
0000000810 00000 n
0000000314 00000 n
0000000396 00000 n
0000000611 00000 n
0000000710 00000 n
0000000729 00000 n
0000000847 00000 n
trailer <<
/Root 1 0 R
/Size 8
/ID [<31415926535897932384626433832795><31415926535897932384626433832795>]
>>
startxref
845
882
%%EOF