AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[config] Don't compile buffer serialize API if HB_NO_BUFFER_SERIALIZE

Browse Source 
Part of https://github.com/harfbuzz/harfbuzz/issues/1652
This commit is contained in:
Behdad Esfahbod 2019-06-18 13:26:03 -07:00
parent bdbabd110c
commit be1c0ab218
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/hb-buffer-serialize.cc
View File

@ -24,14 +24,16 @@
* Google Author(s): Behdad Esfahbod * Google Author(s): Behdad Esfahbod
*/ */
#include "hb.hh"
#ifndef HB_NO_BUFFER_SERIALIZE
#include "hb-buffer.hh" #include "hb-buffer.hh"
static const char *serialize_formats[] = { static const char *serialize_formats[] = {
#ifndef HB_NO_BUFFER_SERIALIZE
"text", "text",
"json", "json",
#endif
nullptr nullptr
}; };
@ -89,10 +91,8 @@ hb_buffer_serialize_format_to_string (hb_buffer_serialize_format_t format)
{ {
switch ((unsigned) format) switch ((unsigned) format)
{ {
#ifndef HB_NO_BUFFER_SERIALIZE
case HB_BUFFER_SERIALIZE_FORMAT_TEXT: return serialize_formats[0]; case HB_BUFFER_SERIALIZE_FORMAT_TEXT: return serialize_formats[0];
case HB_BUFFER_SERIALIZE_FORMAT_JSON: return serialize_formats[1]; case HB_BUFFER_SERIALIZE_FORMAT_JSON: return serialize_formats[1];
#endif
default: default:
case HB_BUFFER_SERIALIZE_FORMAT_INVALID: return nullptr; case HB_BUFFER_SERIALIZE_FORMAT_INVALID: return nullptr;
} }
@ -348,10 +348,6 @@ hb_buffer_serialize_glyphs (hb_buffer_t *buffer,
if (buf_size) if (buf_size)
*buf = '\0'; *buf = '\0';
#ifdef HB_NO_BUFFER_SERIALIZE
return 0;
#endif
assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) || assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) ||
buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS); buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS);
@ -457,10 +453,6 @@ hb_buffer_deserialize_glyphs (hb_buffer_t *buffer,
end_ptr = &end; end_ptr = &end;
*end_ptr = buf; *end_ptr = buf;
#ifdef HB_NO_BUFFER_SERIALIZE
return false;
#endif
assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) || assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) ||
buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS); buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS);
@ -496,3 +488,6 @@ hb_buffer_deserialize_glyphs (hb_buffer_t *buffer,
} }
} }
#endif

7
src/test-buffer-serialize.cc
View File

@ -37,6 +37,10 @@
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
bool ret = true;
#ifndef HB_NO_BUFFER_SERIALIZE
if (argc != 2) { if (argc != 2) {
fprintf (stderr, "usage: %s font-file\n", argv[0]); fprintf (stderr, "usage: %s font-file\n", argv[0]);
exit (1); exit (1);
@ -59,7 +63,6 @@ main (int argc, char **argv)
hb_buffer_t *buf; hb_buffer_t *buf;
buf = hb_buffer_create (); buf = hb_buffer_create ();
bool ret = true;
char line[BUFSIZ], out[BUFSIZ]; char line[BUFSIZ], out[BUFSIZ];
while (fgets (line, sizeof(line), stdin) != nullptr) while (fgets (line, sizeof(line), stdin) != nullptr)
{ {
@ -85,5 +88,7 @@ main (int argc, char **argv)
hb_font_destroy (font); hb_font_destroy (font);
#endif
return !ret; return !ret;
} }