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

Include hb-private.hh more consistently 

Part of fixing https://github.com/behdad/harfbuzz/issues/585
This commit is contained in:
Behdad Esfahbod 2017-10-27 09:22:30 -06:00
parent 42d518513c
commit 17f40b7cad
10 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,9 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "hb-private.hh"
#include "hb.h"
#ifdef HAVE_FREETYPE

4
src/test-size-params.cc
View File

@ -24,9 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "hb-private.hh"
#include "hb.h"
#include "hb-ot.h"

4
src/test-would-substitute.cc
View File

@ -24,9 +24,7 @@
* Google Author(s): Behdad Esfahbod
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "hb-private.hh"
#include "hb.h"
#include "hb-ot.h"

1
util/ansi-print.hh
View File

@ -27,6 +27,7 @@
#ifndef ANSI_PRINT_HH
#define ANSI_PRINT_HH
#include "hb-private.hh"
#include <hb.h> /* for int types */
void

5
util/helper-cairo-ansi.hh
View File

@ -24,11 +24,12 @@
* Google Author(s): Behdad Esfahbod
*/
#include <cairo.h>
#ifndef HELPER_CAIRO_ANSI_HH
#define HELPER_CAIRO_ANSI_HH
#include "hb-private.hh"
#include <cairo.h>
cairo_status_t
helper_cairo_surface_write_to_ansi_stream (cairo_surface_t *surface,

7
util/helper-cairo.hh
View File

@ -24,13 +24,14 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef HELPER_CAIRO_HH
#define HELPER_CAIRO_HH
#include "hb-private.hh"
#include "options.hh"
#include <cairo.h>
#ifndef HELPER_CAIRO_HH
#define HELPER_CAIRO_HH
cairo_scaled_font_t *
helper_cairo_create_scaled_font (const font_options_t *font_opts);

5
util/main-font-text.hh
View File

@ -24,11 +24,12 @@
* Google Author(s): Behdad Esfahbod
*/
#include "options.hh"
#ifndef HB_MAIN_FONT_TEXT_HH
#define HB_MAIN_FONT_TEXT_HH
#include "hb-private.hh"
#include "options.hh"
/* main() body for utilities taking font and processing text.*/
static char *

11
util/options.hh
View File

@ -27,10 +27,7 @@
#ifndef OPTIONS_HH
#define OPTIONS_HH
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "hb-private.hh"
#include <stdlib.h>
#include <stddef.h>
@ -59,12 +56,6 @@
# define g_mapped_file_unref g_mapped_file_free
#endif
/* Normally I don't like including private headers, but hb-private.hh
* is generic utility stuff and in no way exposes the internals of
* libharfbuzz.
*/
#include "hb-private.hh"
void fail (hb_bool_t suggest_help, const char *format, ...) G_GNUC_NORETURN G_GNUC_PRINTF (2, 3);
extern hb_bool_t debug;

5
util/shape-consumer.hh
View File

@ -24,11 +24,12 @@
* Google Author(s): Behdad Esfahbod
*/
#include "options.hh"
#ifndef HB_SHAPE_CONSUMER_HH
#define HB_SHAPE_CONSUMER_HH
#include "hb-private.hh"
#include "options.hh"
template <typename output_t>
struct shape_consumer_t

7
util/view-cairo.hh
View File

@ -24,12 +24,13 @@
* Google Author(s): Behdad Esfahbod
*/
#include "options.hh"
#include "helper-cairo.hh"
#ifndef VIEW_CAIRO_HH
#define VIEW_CAIRO_HH
#include "hb-private.hh"
#include "options.hh"
#include "helper-cairo.hh"
struct view_cairo_t
{