diff options
Diffstat (limited to 'src/test.cc')
| -rw-r--r-- | src/test.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/test.cc b/src/test.cc index 0c90f8f..9592b37 100644 --- a/src/test.cc +++ b/src/test.cc @@ -24,9 +24,7 @@ * Google Author(s): Behdad Esfahbod */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +#include "hb-private.hh" #include "hb.h" @@ -46,7 +44,7 @@ int main (int argc, char **argv) { - hb_blob_t *blob = NULL; + hb_blob_t *blob = nullptr; if (argc != 2) { fprintf (stderr, "usage: %s font-file.ttf\n", argv[0]); @@ -62,7 +60,7 @@ main (int argc, char **argv) hb_memory_mode_t mm; #ifdef HAVE_GLIB - GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL); + GMappedFile *mf = g_mapped_file_new (argv[1], false, nullptr); font_data = g_mapped_file_get_contents (mf); len = g_mapped_file_get_length (mf); destroy = (hb_destroy_func_t) g_mapped_file_unref; @@ -90,7 +88,7 @@ main (int argc, char **argv) /* Create the face */ hb_face_t *face = hb_face_create (blob, 0 /* first face */); hb_blob_destroy (blob); - blob = NULL; + blob = nullptr; unsigned int upem = hb_face_get_upem (face); hb_font_t *font = hb_font_create (face); @@ -105,11 +103,11 @@ main (int argc, char **argv) hb_buffer_add_utf8 (buffer, "\xe0\xa4\x95\xe0\xa5\x8d\xe0\xa4\xb0\xe0\xa5\x8d\xe0\xa4\x95", -1, 0, -1); hb_buffer_guess_segment_properties (buffer); - hb_shape (font, buffer, NULL, 0); + hb_shape (font, buffer, nullptr, 0); unsigned int count = hb_buffer_get_length (buffer); - hb_glyph_info_t *infos = hb_buffer_get_glyph_infos (buffer, NULL); - hb_glyph_position_t *positions = hb_buffer_get_glyph_positions (buffer, NULL); + hb_glyph_info_t *infos = hb_buffer_get_glyph_infos (buffer, nullptr); + hb_glyph_position_t *positions = hb_buffer_get_glyph_positions (buffer, nullptr); for (unsigned int i = 0; i < count; i++) { |