| Index: third_party/harfbuzz-ng/src/hb-gobject.h
|
| diff --git a/third_party/harfbuzz-ng/src/hb-ft.h b/third_party/harfbuzz-ng/src/hb-gobject.h
|
| similarity index 57%
|
| copy from third_party/harfbuzz-ng/src/hb-ft.h
|
| copy to third_party/harfbuzz-ng/src/hb-gobject.h
|
| index be5c854723a95073543c814a079533b4d622ca5d..25fc94180c0bf87341ee47cef4420cc23d451639 100644
|
| --- a/third_party/harfbuzz-ng/src/hb-ft.h
|
| +++ b/third_party/harfbuzz-ng/src/hb-gobject.h
|
| @@ -1,5 +1,5 @@
|
| /*
|
| - * Copyright (C) 2009 Red Hat, Inc.
|
| + * Copyright © 2011 Google, Inc.
|
| *
|
| * This is part of HarfBuzz, a text shaping library.
|
| *
|
| @@ -21,38 +21,48 @@
|
| * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
|
| * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
|
| *
|
| - * Red Hat Author(s): Behdad Esfahbod
|
| + * Google Author(s): Behdad Esfahbod
|
| */
|
|
|
| -#ifndef HB_FT_H
|
| -#define HB_FT_H
|
| +#ifndef HB_GOBJECT_H
|
| +#define HB_GOBJECT_H
|
|
|
| #include "hb.h"
|
| +#include <glib-object.h>
|
|
|
| -#include "hb-font.h"
|
| +HB_BEGIN_DECLS
|
|
|
| -#include <ft2build.h>
|
| -#include FT_FREETYPE_H
|
|
|
| -HB_BEGIN_DECLS
|
| +/* Objects */
|
| +
|
| +#define HB_GOBJECT_TYPE_BLOB hb_gobject_blob_get_type ()
|
| +GType
|
| +hb_gobject_blob_get_type (void);
|
| +
|
| +#define HB_GOBJECT_TYPE_BUFFER hb_gobject_buffer_get_type ()
|
| +GType
|
| +hb_gobject_buffer_get_type (void);
|
| +
|
| +#define HB_GOBJECT_TYPE_FACE hb_gobject_face_get_type ()
|
| +GType
|
| +hb_gobject_face_get_type (void);
|
|
|
| +#define HB_GOBJECT_TYPE_FONT hb_gobject_font_get_type ()
|
| +GType
|
| +hb_gobject_font_get_type (void);
|
|
|
| -hb_font_funcs_t *
|
| -hb_ft_get_font_funcs (void);
|
| +#define HB_GOBJECT_TYPE_FONT_FUNCS hb_gobject_font_funcs_get_type ()
|
| +GType
|
| +hb_gobject_font_funcs_get_type (void);
|
|
|
| -hb_face_t *
|
| -hb_ft_face_create (FT_Face ft_face,
|
| - hb_destroy_func_t destroy);
|
| +#define HB_GOBJECT_TYPE_UNICODE_FUNCS hb_gobject_unicode_funcs_get_type ()
|
| +GType
|
| +hb_gobject_unicode_funcs_get_type (void);
|
|
|
| -/* Note: This function is not thread-safe */
|
| -hb_face_t *
|
| -hb_ft_face_create_cached (FT_Face ft_face);
|
|
|
| -hb_font_t *
|
| -hb_ft_font_create (FT_Face ft_face,
|
| - hb_destroy_func_t destroy);
|
| +/* Enums */
|
|
|
|
|
| HB_END_DECLS
|
|
|
| -#endif /* HB_FT_H */
|
| +#endif /* HB_GOBJECT_H */
|
|
|