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

Move Color tables to src/OT/Color/

This commit is contained in:
Matthias Clasen 2023-01-01 09:46:11 -05:00 committed by Behdad Esfahbod
parent a5f1f3a05c
commit 4adc748b13
14 changed files with 68 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile.sources
View File

@ -68,11 +68,6 @@ HB_BASE_sources = \
hb-ot-cff2-table.cc \ hb-ot-cff2-table.cc \
hb-ot-cff2-table.hh \ hb-ot-cff2-table.hh \
hb-ot-cmap-table.hh \ hb-ot-cmap-table.hh \
hb-ot-color-cbdt-table.hh \
hb-ot-color-colr-table.hh \
hb-ot-color-cpal-table.hh \
hb-ot-color-sbix-table.hh \
hb-ot-color-svg-table.hh \
hb-ot-color.cc \ hb-ot-color.cc \
hb-ot-face-table-list.hh \ hb-ot-face-table-list.hh \
hb-ot-face.cc \ hb-ot-face.cc \
@ -94,6 +89,11 @@ HB_BASE_sources = \
hb-paint-extents.cc \ hb-paint-extents.cc \
hb-paint-extents.hh \ hb-paint-extents.hh \
hb-ot-layout-gsub-table.hh \ hb-ot-layout-gsub-table.hh \
OT/Color/CBDT/CBDT.hh \
OT/Color/COLR/COLR.hh \
OT/Color/CPAL/CPAL.hh \
OT/Color/sbix/sbix.hh \
OT/Color/svg/svg.hh \
OT/glyf/glyf.hh \ OT/glyf/glyf.hh \
OT/glyf/glyf-helpers.hh \ OT/glyf/glyf-helpers.hh \
OT/glyf/loca.hh \ OT/glyf/loca.hh \
@ -340,7 +340,6 @@ HB_SUBSET_sources = \
hb-number.hh \ hb-number.hh \
hb-ot-cff1-table.cc \ hb-ot-cff1-table.cc \
hb-ot-cff2-table.cc \ hb-ot-cff2-table.cc \
hb-ot-color-colrv1-closure.hh \
hb-ot-post-table-v2subset.hh \ hb-ot-post-table-v2subset.hh \
hb-static.cc \ hb-static.cc \
hb-subset-cff-common.cc \ hb-subset-cff-common.cc \
@ -368,6 +367,7 @@ HB_SUBSET_sources = \
graph/markbasepos-graph.hh \ graph/markbasepos-graph.hh \
graph/split-helpers.hh \ graph/split-helpers.hh \
graph/serialize.hh \ graph/serialize.hh \
OT/Color/COLR/colrv1-closure.hh \
$(NULL) $(NULL)
HB_SUBSET_headers = \ HB_SUBSET_headers = \

10
src/hb-ot-color-cbdt-table.hh → src/OT/Color/CBDT/CBDT.hh
View File

@ -24,11 +24,11 @@
* Google Author(s): Seigo Nonaka, Calder Kitagawa * Google Author(s): Seigo Nonaka, Calder Kitagawa
*/ */
#ifndef HB_OT_COLOR_CBDT_TABLE_HH #ifndef OT_COLOR_CBDT_CBDT_HH
#define HB_OT_COLOR_CBDT_TABLE_HH #define OT_COLOR_CBDT_CBDT_HH
#include "hb-open-type.hh" #include "../../../hb-open-type.hh"
#include "hb-paint.hh" #include "../../../hb-paint.hh"
/* /*
* CBLC -- Color Bitmap Location * CBLC -- Color Bitmap Location
@ -1027,4 +1027,4 @@ struct CBDT_accelerator_t : CBDT::accelerator_t {
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OT_COLOR_CBDT_TABLE_HH */ #endif /* OT_COLOR_CBDT_CBDT_HH */

18
src/hb-ot-color-colr-table.hh → src/OT/Color/COLR/COLR.hh
View File

@ -25,15 +25,15 @@
* Google Author(s): Calder Kitagawa * Google Author(s): Calder Kitagawa
*/ */
#ifndef HB_OT_COLOR_COLR_TABLE_HH #ifndef OT_COLOR_COLR_COLR_HH
#define HB_OT_COLOR_COLR_TABLE_HH #define OT_COLOR_COLR_COLR_HH
#include "hb.hh" #include "../../../hb.hh"
#include "hb-open-type.hh" #include "../../../hb-open-type.hh"
#include "hb-ot-layout-common.hh" #include "../../../hb-ot-layout-common.hh"
#include "hb-ot-var-common.hh" #include "../../../hb-ot-var-common.hh"
#include "hb-paint.hh" #include "../../../hb-paint.hh"
#include "hb-paint-extents.hh" #include "../../../hb-paint-extents.hh"
/* /*
* COLR -- Color * COLR -- Color
@ -2178,4 +2178,4 @@ void PaintColrGlyph::paint_glyph (hb_paint_context_t *c) const
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OT_COLOR_COLR_TABLE_HH */ #endif /* OT_COLOR_COLR_COLR_HH */

12
src/hb-ot-color-colrv1-closure.hh → src/OT/Color/COLR/colrv1-closure.hh
View File

@ -24,12 +24,12 @@
* *
*/ */
#ifndef HB_OT_COLR_COLRV1_CLOSURE_HH #ifndef OT_COLOR_COLR_COLRV1_CLOSURE_HH
#define HB_OT_COLR_COLRV1_CLOSURE_HH #define OT_COLOR_COLR_COLRV1_CLOSURE_HH
#include "hb-open-type.hh" #include "../../../hb-open-type.hh"
#include "hb-ot-layout-common.hh" #include "../../../hb-ot-layout-common.hh"
#include "hb-ot-color-colr-table.hh" #include "COLR.hh"
/* /*
* COLR -- Color * COLR -- Color
@ -105,4 +105,4 @@ HB_INTERNAL void PaintComposite::closurev1 (hb_colrv1_closure_context_t* c) cons
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OT_COLR_COLRV1_CLOSURE_HH */ #endif /* OT_COLOR_COLR_COLRV1_CLOSURE_HH */

12
src/hb-ot-color-cpal-table.hh → src/OT/Color/CPAL/CPAL.hh
View File

@ -25,12 +25,12 @@
* Google Author(s): Sascha Brawer * Google Author(s): Sascha Brawer
*/ */
#ifndef HB_OT_COLOR_CPAL_TABLE_HH #ifndef OT_COLOR_CPAL_CPAL_HH
#define HB_OT_COLOR_CPAL_TABLE_HH #define OT_COLOR_CPAL_CPAL_HH
#include "hb-open-type.hh" #include "../../../hb-open-type.hh"
#include "hb-ot-color.h" #include "../../../hb-ot-color.h"
#include "hb-ot-name.h" #include "../../../hb-ot-name.h"
/* /*
@ -319,4 +319,4 @@ struct CPAL
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OT_COLOR_CPAL_TABLE_HH */ #endif /* OT_COLOR_CPAL_CPAL_HH */

12
src/hb-ot-color-sbix-table.hh → src/OT/Color/sbix/sbix.hh
View File

@ -25,12 +25,12 @@
* Google Author(s): Calder Kitagawa * Google Author(s): Calder Kitagawa
*/ */
#ifndef HB_OT_COLOR_SBIX_TABLE_HH #ifndef OT_COLOR_SBIX_SBIX_HH
#define HB_OT_COLOR_SBIX_TABLE_HH #define OT_COLOR_SBIX_SBIX_HH
#include "hb-open-type.hh" #include "../../../hb-open-type.hh"
#include "hb-ot-layout-common.hh" #include "../../../hb-ot-layout-common.hh"
#include "hb-paint.hh" #include "../../../hb-paint.hh"
/* /*
* sbix -- Standard Bitmap Graphics * sbix -- Standard Bitmap Graphics
@ -450,4 +450,4 @@ struct sbix_accelerator_t : sbix::accelerator_t {
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OT_COLOR_SBIX_TABLE_HH */ #endif /* OT_COLOR_SBIX_SBIX_HH */

12
src/hb-ot-color-svg-table.hh → src/OT/Color/svg/svg.hh
View File

@ -22,12 +22,12 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/ */
#ifndef HB_OT_COLOR_SVG_TABLE_HH #ifndef OT_COLOR_SVG_SVG_HH
#define HB_OT_COLOR_SVG_TABLE_HH #define OT_COLOR_SVG_SVG_HH
#include "hb-open-type.hh" #include "../../../hb-open-type.hh"
#include "hb-blob.hh" #include "../../../hb-blob.hh"
#include "hb-paint.hh" #include "../../../hb-paint.hh"
/* /*
* SVG -- SVG (Scalable Vector Graphics) * SVG -- SVG (Scalable Vector Graphics)
@ -148,4 +148,4 @@ struct SVG_accelerator_t : SVG::accelerator_t {
} /* namespace OT */ } /* namespace OT */
#endif /* HB_OT_COLOR_SVG_TABLE_HH */ #endif /* OT_COLOR_SVG_SVG_HH */

10
src/hb-ot-color.cc
View File

@ -31,11 +31,11 @@
#include "hb-ot.h" #include "hb-ot.h"
#include "hb-ot-color-cbdt-table.hh" #include "OT/Color/CBDT/CBDT.hh"
#include "hb-ot-color-colr-table.hh" #include "OT/Color/COLR/COLR.hh"
#include "hb-ot-color-cpal-table.hh" #include "OT/Color/CPAL/CPAL.hh"
#include "hb-ot-color-sbix-table.hh" #include "OT/Color/sbix/sbix.hh"
#include "hb-ot-color-svg-table.hh" #include "OT/Color/svg/svg.hh"
/** /**

6
src/hb-ot-face.cc
View File

@ -35,9 +35,9 @@
#include "hb-ot-meta-table.hh" #include "hb-ot-meta-table.hh"
#include "hb-ot-name-table.hh" #include "hb-ot-name-table.hh"
#include "hb-ot-post-table.hh" #include "hb-ot-post-table.hh"
#include "hb-ot-color-cbdt-table.hh" #include "OT/Color/CBDT/CBDT.hh"
#include "hb-ot-color-sbix-table.hh" #include "OT/Color/sbix/sbix.hh"
#include "hb-ot-color-svg-table.hh" #include "OT/Color/svg/svg.hh"
#include "hb-ot-layout-gdef-table.hh" #include "hb-ot-layout-gdef-table.hh"
#include "hb-ot-layout-gsub-table.hh" #include "hb-ot-layout-gsub-table.hh"
#include "hb-ot-layout-gpos-table.hh" #include "hb-ot-layout-gpos-table.hh"

8
src/hb-ot-font.cc
View File

@ -43,10 +43,10 @@
#include "hb-ot-post-table.hh" #include "hb-ot-post-table.hh"
#include "hb-ot-stat-table.hh" // Just so we compile it; unused otherwise. #include "hb-ot-stat-table.hh" // Just so we compile it; unused otherwise.
#include "hb-ot-vorg-table.hh" #include "hb-ot-vorg-table.hh"
#include "hb-ot-color-cbdt-table.hh" #include "OT/Color/CBDT/CBDT.hh"
#include "hb-ot-color-sbix-table.hh" #include "OT/Color/COLR/COLR.hh"
#include "hb-ot-color-colr-table.hh" #include "OT/Color/sbix/sbix.hh"
#include "hb-ot-color-svg-table.hh" #include "OT/Color/svg/svg.hh"
/** /**

2
src/hb-static.cc
View File

@ -33,7 +33,7 @@
#include "hb-aat-layout-feat-table.hh" #include "hb-aat-layout-feat-table.hh"
#include "hb-ot-layout-common.hh" #include "hb-ot-layout-common.hh"
#include "hb-ot-cmap-table.hh" #include "hb-ot-cmap-table.hh"
#include "hb-ot-color-colr-table.hh" #include "OT/Color/COLR/COLR.hh"
#include "hb-ot-glyf-table.hh" #include "hb-ot-glyf-table.hh"
#include "hb-ot-head-table.hh" #include "hb-ot-head-table.hh"
#include "hb-ot-maxp-table.hh" #include "hb-ot-maxp-table.hh"

4
src/hb-subset-plan.cc
View File

@ -36,8 +36,8 @@
#include "hb-ot-layout-gpos-table.hh" #include "hb-ot-layout-gpos-table.hh"
#include "hb-ot-layout-gsub-table.hh" #include "hb-ot-layout-gsub-table.hh"
#include "hb-ot-cff1-table.hh" #include "hb-ot-cff1-table.hh"
#include "hb-ot-color-colr-table.hh" #include "OT/Color/COLR/COLR.hh"
#include "hb-ot-color-colrv1-closure.hh" #include "OT/Color/COLR/colrv1-closure.hh"
#include "hb-ot-var-fvar-table.hh" #include "hb-ot-var-fvar-table.hh"
#include "hb-ot-var-avar-table.hh" #include "hb-ot-var-avar-table.hh"
#include "hb-ot-stat-table.hh" #include "hb-ot-stat-table.hh"

8
src/hb-subset.cc
View File

@ -37,9 +37,10 @@
#include "hb-ot-hhea-table.hh" #include "hb-ot-hhea-table.hh"
#include "hb-ot-hmtx-table.hh" #include "hb-ot-hmtx-table.hh"
#include "hb-ot-maxp-table.hh" #include "hb-ot-maxp-table.hh"
#include "hb-ot-color-sbix-table.hh" #include "OT/Color/CBDT/CBDT.hh"
#include "hb-ot-color-colr-table.hh" #include "OT/Color/COLR/COLR.hh"
#include "hb-ot-color-cpal-table.hh" #include "OT/Color/CPAL/CPAL.hh"
#include "OT/Color/sbix/sbix.hh"
#include "hb-ot-os2-table.hh" #include "hb-ot-os2-table.hh"
#include "hb-ot-post-table.hh" #include "hb-ot-post-table.hh"
#include "hb-ot-post-table-v2subset.hh" #include "hb-ot-post-table-v2subset.hh"
@ -47,7 +48,6 @@
#include "hb-ot-cff2-table.hh" #include "hb-ot-cff2-table.hh"
#include "hb-ot-vorg-table.hh" #include "hb-ot-vorg-table.hh"
#include "hb-ot-name-table.hh" #include "hb-ot-name-table.hh"
#include "hb-ot-color-cbdt-table.hh"
#include "hb-ot-layout-gsub-table.hh" #include "hb-ot-layout-gsub-table.hh"
#include "hb-ot-layout-gpos-table.hh" #include "hb-ot-layout-gpos-table.hh"
#include "hb-ot-var-fvar-table.hh" #include "hb-ot-var-fvar-table.hh"

10
src/meson.build
View File

@ -76,11 +76,6 @@ hb_base_sources = files(
'hb-ot-cff2-table.cc', 'hb-ot-cff2-table.cc',
'hb-ot-cff2-table.hh', 'hb-ot-cff2-table.hh',
'hb-ot-cmap-table.hh', 'hb-ot-cmap-table.hh',
'hb-ot-color-cbdt-table.hh',
'hb-ot-color-colr-table.hh',
'hb-ot-color-cpal-table.hh',
'hb-ot-color-sbix-table.hh',
'hb-ot-color-svg-table.hh',
'hb-ot-color.cc', 'hb-ot-color.cc',
'hb-ot-face-table-list.hh', 'hb-ot-face-table-list.hh',
'hb-ot-face.cc', 'hb-ot-face.cc',
@ -98,6 +93,11 @@ hb_base_sources = files(
'hb-ot-layout-gdef-table.hh', 'hb-ot-layout-gdef-table.hh',
'hb-ot-layout-gpos-table.hh', 'hb-ot-layout-gpos-table.hh',
'hb-ot-layout-gsub-table.hh', 'hb-ot-layout-gsub-table.hh',
'OT/Color/CBDT/CBDT.hh',
'OT/Color/COLR/COLR.hh',
'OT/Color/CPAL/CPAL.hh',
'OT/Color/sbix/sbix.hh',
'OT/Color/svg/svg.hh',
'OT/glyf/glyf.hh', 'OT/glyf/glyf.hh',
'OT/glyf/glyf-helpers.hh', 'OT/glyf/glyf-helpers.hh',
'OT/glyf/loca.hh', 'OT/glyf/loca.hh',