general/freetype2
2
0
Fork 0
mirror of git://git.sv.nongnu.org/freetype/freetype2.git synced 2026-01-19 04:52:09 +00:00
Code Issues Projects Releases Wiki Activity

[autofit] Rename 'ft-hb' to 'ft-hb-ft'.

Browse Source 
Since it's a (shrinked) copy of 'hb-ft'.

* src/autofit/afglobal.c (af_face_globals_new), src/autofit/afshaper.h,
  src/autofit/autofit.c: Updated.

* src/autofit/ft-hb.c, src/autofit/ft-hb.h: Renamed to...
* src/autofit/ft-hb-ft.c, src/autofit/ft-hb-ft.h: ...this; updated.

* src/autofit/rules.mk (AUTOF_DRV_SRC): Updated.
This commit is contained in:
Behdad Esfahbod (بهداد اسفهبد)
2025-04-12 00:44:46 -06:00
committed by Werner Lemberg
parent f35bb75954
commit 3eb4eadea5
6 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/autofit/afglobal.c
View File

@@ -356,7 +356,7 @@
globals->scale_down_factor = 0;
#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
globals->hb_font = hb_ft_font_create_( face, NULL );
globals->hb_font = ft_hb_ft_font_create( face, NULL );
globals->hb_buf = hb_buffer_create();
#endif

2
src/autofit/afshaper.h
View File

@@ -27,7 +27,7 @@
#include <hb.h>
#include <hb-ot.h>
#include "ft-hb.h"
#include "ft-hb-ft.h"
#endif

2
src/autofit/autofit.c
View File

@@ -18,7 +18,7 @@
#define FT_MAKE_OPTION_SINGLE_OBJECT
#include "ft-hb.c"
#include "ft-hb-ft.c"
#include "afadjust.c"
#include "afblue.c"
#include "afcjk.c"

18
src/autofit/ft-hb.c → src/autofit/ft-hb-ft.c
View File

@@ -29,14 +29,14 @@
#ifdef FT_CONFIG_OPTION_USE_HARFBUZZ
#include "ft-hb.h"
#include "ft-hb-ft.h"
/* The following three functions are a more or less verbatim
* copy of corresponding HarfBuzz code from hb-ft.cc
*/
static hb_blob_t *
hb_ft_reference_table_ (hb_face_t *face, hb_tag_t tag, void *user_data)
ft_hb_ft_reference_table (hb_face_t *face, hb_tag_t tag, void *user_data)
{
FT_Face ft_face = (FT_Face) user_data;
FT_Byte *buffer;
@@ -68,8 +68,8 @@ hb_ft_reference_table_ (hb_face_t *face, hb_tag_t tag, void *user_data)
}
static hb_face_t *
hb_ft_face_create_ (FT_Face ft_face,
hb_destroy_func_t destroy)
ft_hb_ft_face_create (FT_Face ft_face,
hb_destroy_func_t destroy)
{
hb_face_t *face;
@@ -83,7 +83,7 @@ hb_ft_face_create_ (FT_Face ft_face,
face = hb_face_create (blob, ft_face->face_index);
hb_blob_destroy (blob);
} else {
face = hb_face_create_for_tables (hb_ft_reference_table_, ft_face, destroy);
face = hb_face_create_for_tables (ft_hb_ft_reference_table, ft_face, destroy);
}
hb_face_set_index (face, ft_face->face_index);
@@ -93,13 +93,13 @@ hb_ft_face_create_ (FT_Face ft_face,
}
FT_LOCAL_DEF(hb_font_t *)
hb_ft_font_create_ (FT_Face ft_face,
hb_destroy_func_t destroy)
ft_hb_ft_font_create (FT_Face ft_face,
hb_destroy_func_t destroy)
{
hb_font_t *font;
hb_face_t *face;
face = hb_ft_face_create_ (ft_face, destroy);
face = ft_hb_ft_face_create (ft_face, destroy);
font = hb_font_create (face);
hb_face_destroy (face);
return font;
@@ -108,7 +108,7 @@ hb_ft_font_create_ (FT_Face ft_face,
#else /* !FT_CONFIG_OPTION_USE_HARFBUZZ */
/* ANSI C doesn't like empty source files */
typedef int ft_hb_dummy_;
typedef int ft_hb_ft_dummy_;
#endif /* !FT_CONFIG_OPTION_USE_HARFBUZZ */

10
src/autofit/ft-hb.h → src/autofit/ft-hb-ft.h
View File

@@ -24,8 +24,8 @@
* Google Author(s): Behdad Esfahbod
*/
#ifndef FT_HB_H
#define FT_HB_H
#ifndef FT_HB_FT_H
#define FT_HB_FT_H
#include <hb.h>
@@ -36,13 +36,13 @@
FT_BEGIN_HEADER
FT_LOCAL(hb_font_t *)
hb_ft_font_create_ (FT_Face ft_face,
hb_destroy_func_t destroy);
ft_hb_ft_font_create (FT_Face ft_face,
hb_destroy_func_t destroy);
FT_END_HEADER
#endif /* FT_HB_H */
#endif /* FT_HB_FT_H */
/* END */

2
src/autofit/rules.mk
View File

@@ -40,7 +40,7 @@ AUTOF_DRV_SRC := $(AUTOF_DIR)/afadjust.c \
$(AUTOF_DIR)/afmodule.c \
$(AUTOF_DIR)/afranges.c \
$(AUTOF_DIR)/afshaper.c \
$(AUTOF_DIR)/ft-hb.c
$(AUTOF_DIR)/ft-hb-ft.c
# AUTOF driver headers
#