organicmaps/harfbuzz
13
Fork 0
mirror of https://github.com/harfbuzz/harfbuzz.git synced 2025-04-06 22:15:04 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 7

Merge pull request #5132 from harfbuzz/cplusplus-more

Browse source 
[test-cplusplus] Add more headers
This commit is contained in:
Behdad Esfahbod 2025-03-11 11:55:46 -06:00 • committed by GitHub
commit 3c30562dc7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 69 additions and 109 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
meson.build
View file

@ -314,7 +314,7 @@ endif
gdi_uniscribe_deps = []
# GDI (Uniscribe) (Windows)
if host_machine.system() == 'windows' and not get_option('gdi').disabled()
if (get_option('directwrite').enabled() and
if (get_option('gdi').enabled() and
not (cpp.has_header('usp10.h') and cpp.has_header('windows.h')))
error('GDI/Uniscribe was enabled explicitly, but required headers are missing.')
endif
@ -334,10 +334,9 @@ endif
# DirectWrite (Windows)
if host_machine.system() == 'windows' and not get_option('directwrite').disabled()
if get_option('directwrite').enabled() and not cpp.has_header('dwrite_1.h')
if get_option('directwrite').enabled() and not cpp.has_header('dwrite_3.h')
error('DirectWrite was enabled explicitly, but required header is missing.')
endif
conf.set('HAVE_DIRECTWRITE', 1)
endif

3
src/hb-directwrite.cc
View file

@ -28,9 +28,6 @@
#include "hb-shaper-impl.hh"
#include <dwrite_1.h>
#include <dwrite_3.h>
#include "hb-directwrite.h"
#include "hb-ms-feature-ranges.hh"

2
src/hb-directwrite.h
View file

@ -27,6 +27,8 @@
#include "hb.h"
#include <dwrite_3.h>
HB_BEGIN_DECLS
HB_EXTERN hb_face_t *

11
test/api/hb-test.h
View file

@ -223,16 +223,6 @@ hb_test_add_func (const char *test_path,
}
#define hb_test_add(Func) hb_test_add_func (#Func, Func)
static inline void
hb_test_add_func_flavor (const char *test_path,
const char *flavor,
hb_test_func_t test_func)
{
char *path = g_strdup_printf ("%s/%s", test_path, flavor);
hb_test_add_func (path, test_func);
g_free (path);
}
#define hb_test_add_flavor(Flavor, Func) hb_test_add_func (#Func, Flavor, Func)
static inline void
hb_test_add_data_func (const char *test_path,
@ -257,6 +247,7 @@ hb_test_add_data_func_flavor (const char *test_path,
}
#define hb_test_add_data_flavor(UserData, Flavor, Func) hb_test_add_data_func_flavor (#Func, Flavor, UserData, Func)
#define hb_test_add_flavor(Flavor, Func) hb_test_add_data_flavor (Flavor, Flavor, Func)
static inline void
hb_test_add_vtable (const char *test_path,

12
test/api/meson.build
View file

@ -102,7 +102,17 @@ foreach source : tests
cpp_args = []
test_name = source.split('.')[0]
deps = [glib_dep, freetype_dep, thread_dep, libharfbuzz_dep, libharfbuzz_icu_dep]
deps = [coretext_deps,
freetype_dep,
gdi_uniscribe_deps,
glib_dep,
graphite2_dep,
thread_dep,
libharfbuzz_dep,
libharfbuzz_icu_dep,
libharfbuzz_cairo_dep,
#libharfbuzz_gobject_dep
]
suite = ['api']
if test_name.contains('-subset') or test_name.contains('-instance')
deps += libharfbuzz_subset_dep

51
test/api/test-c.c
View file

@ -32,31 +32,54 @@
#endif
#include <hb.h>
#include <hb-subset.h>
#include <hb-ot.h>
#include <hb-aat.h>
#ifdef HAVE_GLIB
#include <hb-glib.h>
#endif
#ifdef HAVE_ICU
#include <hb-icu.h>
#endif
#ifdef HAVE_FREETYPE
#include <hb-ft.h>
#endif
#ifdef HAVE_UNISCRIBE
#include <hb-uniscribe.h>
#ifdef HAVE_CAIRO
#include <hb-cairo.h>
#endif
#ifdef HAVE_CORETEXT
#include <hb-coretext.h>
#endif
#ifdef HAVE_FREETYPE
#include <hb-ft.h>
#endif
#ifdef HAVE_FONTATIONS
#include <hb-fontations.h>
#endif
#ifdef HAVE_GDI
#include <hb-gdi.h>
#endif
#ifdef HAVE_GLIB
#include <hb-glib.h>
#endif
#ifdef HAVE_GRAPHITE2
#include <hb-graphite2.h>
#endif
#ifdef HAVE_GOBJECT
//#include <hb-gobject.h> // Doesn't work uninstalled
#endif
#ifdef HAVE_ICU
#include <hb-icu.h>
#endif
#ifdef HAVE_UNISCRIBE
#include <hb-uniscribe.h>
#endif
#ifndef NO_MAIN
int
main (void)
{
return !*hb_shape_list_shapers ();
}
#endif

31
test/api/test-cplusplus.cc
View file

@ -28,33 +28,12 @@
/* This file tests that all headers can be included from C++ files,
* as well as test the C++ API. */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#define NO_MAIN
#include "test-c.c"
#undef NO_MAIN
#include <hb.h>
#include <hb-subset.h>
#include <hb-ot.h>
#include <hb-aat.h>
#ifdef HAVE_GLIB
#include <hb-glib.h>
#endif
#ifdef HAVE_ICU
#include <hb-icu.h>
#endif
#ifdef HAVE_FREETYPE
#include <hb-ft.h>
#endif
#ifdef HAVE_UNISCRIBE
#include <hb-uniscribe.h>
#endif
#ifdef HAVE_CORETEXT
#include <hb-coretext.h>
#ifdef HAVE_DIRECTWRITE
#include <hb-directwrite.h>
#endif

2
test/api/test-directwrite.cc
View file

@ -25,8 +25,6 @@
*/
#include <dwrite_3.h>
#include "hb-test.h"
#include "hb-directwrite.h"

61
test/api/test-draw.c
View file

@ -26,12 +26,6 @@
#include <math.h>
#include <hb.h>
#ifdef HAVE_FREETYPE
#include <hb-ft.h>
#endif
#ifdef HAVE_FONTATIONS
#include <hb-fontations.h>
#endif
typedef struct draw_data_t
{
@ -1078,8 +1072,9 @@ test_hb_draw_immutable (void)
}
static void
test_hb_draw_funcs (const char* font_funcs_name)
test_hb_draw_funcs (const void* user_data)
{
const char *font_funcs_name = user_data;
char str[1024];
draw_data_t draw_data = {
.str = str,
@ -1097,12 +1092,6 @@ test_hb_draw_funcs (const char* font_funcs_name)
char expected[] = "M50,0L50,750L450,750L450,0L50,0Z";
g_assert_cmpmem (str, draw_data.consumed, expected, sizeof (expected) - 1);
}
{
draw_data.consumed = 0;
hb_font_draw_glyph (font, 5, funcs, &draw_data);
char expected[] = "M15,0Q15,0 15,0Z";
g_assert_cmpmem (str, draw_data.consumed, expected, sizeof (expected) - 1);
}
hb_font_destroy (font);
}
{
@ -1127,8 +1116,9 @@ test_hb_draw_funcs (const char* font_funcs_name)
}
static void
test_hb_draw_compare_ot_funcs (const char* font_funcs_name)
test_hb_draw_compare_ot_funcs (const void *user_data)
{
const char* font_funcs_name = user_data;
char str[1024];
draw_data_t draw_data = {
.str = str,
@ -1162,34 +1152,6 @@ test_hb_draw_compare_ot_funcs (const char* font_funcs_name)
hb_face_destroy (face);
}
#ifdef HAVE_FREETYPE
static void
test_hb_draw_ft (void)
{
test_hb_draw_funcs ("ft");
}
static void
test_hb_draw_compare_ot_ft (void)
{
test_hb_draw_compare_ot_funcs ("ft");
}
#endif
#ifdef HAVE_FONTATIONS
static void
test_hb_draw_fontations (void)
{
test_hb_draw_funcs ("fontations");
}
static void
test_hb_draw_compare_ot_fontations (void)
{
test_hb_draw_compare_ot_funcs ("fontations");
}
#endif
int
main (int argc, char **argv)
{
@ -1224,14 +1186,13 @@ main (int argc, char **argv)
hb_test_add (test_hb_draw_synthetic_slant);
hb_test_add (test_hb_draw_subfont_scale);
hb_test_add (test_hb_draw_immutable);
#ifdef HAVE_FREETYPE
hb_test_add (test_hb_draw_ft);
hb_test_add (test_hb_draw_compare_ot_ft);
#endif
#ifdef HAVE_FONTATIONS
hb_test_add (test_hb_draw_fontations);
hb_test_add (test_hb_draw_compare_ot_fontations);
#endif
const char **font_funcs = hb_font_list_funcs ();
for (const char **font_funcs_name = font_funcs; *font_funcs_name; font_funcs_name++)
{
hb_test_add_flavor (*font_funcs_name, test_hb_draw_funcs);
hb_test_add_flavor (*font_funcs_name, test_hb_draw_compare_ot_funcs);
}
unsigned result = hb_test_run ();