Move Color tables to src/OT/Color/
diff --git a/src/Makefile.sources b/src/Makefile.sources
index 63fffa9..bfbe736 100644
--- a/src/Makefile.sources
+++ b/src/Makefile.sources
@@ -68,11 +68,6 @@
hb-ot-cff2-table.cc \
hb-ot-cff2-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-face-table-list.hh \
hb-ot-face.cc \
@@ -94,6 +89,11 @@
hb-paint-extents.cc \
hb-paint-extents.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-helpers.hh \
OT/glyf/loca.hh \
@@ -340,7 +340,6 @@
hb-number.hh \
hb-ot-cff1-table.cc \
hb-ot-cff2-table.cc \
- hb-ot-color-colrv1-closure.hh \
hb-ot-post-table-v2subset.hh \
hb-static.cc \
hb-subset-cff-common.cc \
@@ -368,6 +367,7 @@
graph/markbasepos-graph.hh \
graph/split-helpers.hh \
graph/serialize.hh \
+ OT/Color/COLR/colrv1-closure.hh \
$(NULL)
HB_SUBSET_headers = \
diff --git a/src/hb-ot-color-cbdt-table.hh b/src/OT/Color/CBDT/CBDT.hh
similarity index 98%
rename from src/hb-ot-color-cbdt-table.hh
rename to src/OT/Color/CBDT/CBDT.hh
index 083b62f..b125052 100644
--- a/src/hb-ot-color-cbdt-table.hh
+++ b/src/OT/Color/CBDT/CBDT.hh
@@ -24,11 +24,11 @@
* Google Author(s): Seigo Nonaka, Calder Kitagawa
*/
-#ifndef HB_OT_COLOR_CBDT_TABLE_HH
-#define HB_OT_COLOR_CBDT_TABLE_HH
+#ifndef OT_COLOR_CBDT_CBDT_HH
+#define OT_COLOR_CBDT_CBDT_HH
-#include "hb-open-type.hh"
-#include "hb-paint.hh"
+#include "../../../hb-open-type.hh"
+#include "../../../hb-paint.hh"
/*
* CBLC -- Color Bitmap Location
@@ -1027,4 +1027,4 @@
} /* namespace OT */
-#endif /* HB_OT_COLOR_CBDT_TABLE_HH */
+#endif /* OT_COLOR_CBDT_CBDT_HH */
diff --git a/src/hb-ot-color-colr-table.hh b/src/OT/Color/COLR/COLR.hh
similarity index 98%
rename from src/hb-ot-color-colr-table.hh
rename to src/OT/Color/COLR/COLR.hh
index 7521845..be1ac08 100644
--- a/src/hb-ot-color-colr-table.hh
+++ b/src/OT/Color/COLR/COLR.hh
@@ -25,15 +25,15 @@
* Google Author(s): Calder Kitagawa
*/
-#ifndef HB_OT_COLOR_COLR_TABLE_HH
-#define HB_OT_COLOR_COLR_TABLE_HH
+#ifndef OT_COLOR_COLR_COLR_HH
+#define OT_COLOR_COLR_COLR_HH
-#include "hb.hh"
-#include "hb-open-type.hh"
-#include "hb-ot-layout-common.hh"
-#include "hb-ot-var-common.hh"
-#include "hb-paint.hh"
-#include "hb-paint-extents.hh"
+#include "../../../hb.hh"
+#include "../../../hb-open-type.hh"
+#include "../../../hb-ot-layout-common.hh"
+#include "../../../hb-ot-var-common.hh"
+#include "../../../hb-paint.hh"
+#include "../../../hb-paint-extents.hh"
/*
* COLR -- Color
@@ -2178,4 +2178,4 @@
} /* namespace OT */
-#endif /* HB_OT_COLOR_COLR_TABLE_HH */
+#endif /* OT_COLOR_COLR_COLR_HH */
diff --git a/src/hb-ot-color-colrv1-closure.hh b/src/OT/Color/COLR/colrv1-closure.hh
similarity index 93%
rename from src/hb-ot-color-colrv1-closure.hh
rename to src/OT/Color/COLR/colrv1-closure.hh
index fbaf2ec..c743297 100644
--- a/src/hb-ot-color-colrv1-closure.hh
+++ b/src/OT/Color/COLR/colrv1-closure.hh
@@ -24,12 +24,12 @@
*
*/
-#ifndef HB_OT_COLR_COLRV1_CLOSURE_HH
-#define HB_OT_COLR_COLRV1_CLOSURE_HH
+#ifndef OT_COLOR_COLR_COLRV1_CLOSURE_HH
+#define OT_COLOR_COLR_COLRV1_CLOSURE_HH
-#include "hb-open-type.hh"
-#include "hb-ot-layout-common.hh"
-#include "hb-ot-color-colr-table.hh"
+#include "../../../hb-open-type.hh"
+#include "../../../hb-ot-layout-common.hh"
+#include "COLR.hh"
/*
* COLR -- Color
@@ -105,4 +105,4 @@
} /* namespace OT */
-#endif /* HB_OT_COLR_COLRV1_CLOSURE_HH */
+#endif /* OT_COLOR_COLR_COLRV1_CLOSURE_HH */
diff --git a/src/hb-ot-color-cpal-table.hh b/src/OT/Color/CPAL/CPAL.hh
similarity index 97%
rename from src/hb-ot-color-cpal-table.hh
rename to src/OT/Color/CPAL/CPAL.hh
index bcab77f..b5517a6 100644
--- a/src/hb-ot-color-cpal-table.hh
+++ b/src/OT/Color/CPAL/CPAL.hh
@@ -25,12 +25,12 @@
* Google Author(s): Sascha Brawer
*/
-#ifndef HB_OT_COLOR_CPAL_TABLE_HH
-#define HB_OT_COLOR_CPAL_TABLE_HH
+#ifndef OT_COLOR_CPAL_CPAL_HH
+#define OT_COLOR_CPAL_CPAL_HH
-#include "hb-open-type.hh"
-#include "hb-ot-color.h"
-#include "hb-ot-name.h"
+#include "../../../hb-open-type.hh"
+#include "../../../hb-ot-color.h"
+#include "../../../hb-ot-name.h"
/*
@@ -319,4 +319,4 @@
} /* namespace OT */
-#endif /* HB_OT_COLOR_CPAL_TABLE_HH */
+#endif /* OT_COLOR_CPAL_CPAL_HH */
diff --git a/src/hb-ot-color-sbix-table.hh b/src/OT/Color/sbix/sbix.hh
similarity index 97%
rename from src/hb-ot-color-sbix-table.hh
rename to src/OT/Color/sbix/sbix.hh
index ecccc83..c48a572 100644
--- a/src/hb-ot-color-sbix-table.hh
+++ b/src/OT/Color/sbix/sbix.hh
@@ -25,12 +25,12 @@
* Google Author(s): Calder Kitagawa
*/
-#ifndef HB_OT_COLOR_SBIX_TABLE_HH
-#define HB_OT_COLOR_SBIX_TABLE_HH
+#ifndef OT_COLOR_SBIX_SBIX_HH
+#define OT_COLOR_SBIX_SBIX_HH
-#include "hb-open-type.hh"
-#include "hb-ot-layout-common.hh"
-#include "hb-paint.hh"
+#include "../../../hb-open-type.hh"
+#include "../../../hb-ot-layout-common.hh"
+#include "../../../hb-paint.hh"
/*
* sbix -- Standard Bitmap Graphics
@@ -450,4 +450,4 @@
} /* namespace OT */
-#endif /* HB_OT_COLOR_SBIX_TABLE_HH */
+#endif /* OT_COLOR_SBIX_SBIX_HH */
diff --git a/src/hb-ot-color-svg-table.hh b/src/OT/Color/svg/svg.hh
similarity index 94%
rename from src/hb-ot-color-svg-table.hh
rename to src/OT/Color/svg/svg.hh
index 042faa3..c7d91b8 100644
--- a/src/hb-ot-color-svg-table.hh
+++ b/src/OT/Color/svg/svg.hh
@@ -22,12 +22,12 @@
* PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
*/
-#ifndef HB_OT_COLOR_SVG_TABLE_HH
-#define HB_OT_COLOR_SVG_TABLE_HH
+#ifndef OT_COLOR_SVG_SVG_HH
+#define OT_COLOR_SVG_SVG_HH
-#include "hb-open-type.hh"
-#include "hb-blob.hh"
-#include "hb-paint.hh"
+#include "../../../hb-open-type.hh"
+#include "../../../hb-blob.hh"
+#include "../../../hb-paint.hh"
/*
* SVG -- SVG (Scalable Vector Graphics)
@@ -148,4 +148,4 @@
} /* namespace OT */
-#endif /* HB_OT_COLOR_SVG_TABLE_HH */
+#endif /* OT_COLOR_SVG_SVG_HH */
diff --git a/src/hb-ot-color.cc b/src/hb-ot-color.cc
index 1716a14..99cec05 100644
--- a/src/hb-ot-color.cc
+++ b/src/hb-ot-color.cc
@@ -31,11 +31,11 @@
#include "hb-ot.h"
-#include "hb-ot-color-cbdt-table.hh"
-#include "hb-ot-color-colr-table.hh"
-#include "hb-ot-color-cpal-table.hh"
-#include "hb-ot-color-sbix-table.hh"
-#include "hb-ot-color-svg-table.hh"
+#include "OT/Color/CBDT/CBDT.hh"
+#include "OT/Color/COLR/COLR.hh"
+#include "OT/Color/CPAL/CPAL.hh"
+#include "OT/Color/sbix/sbix.hh"
+#include "OT/Color/svg/svg.hh"
/**
diff --git a/src/hb-ot-face.cc b/src/hb-ot-face.cc
index 5ef8df4..2243ee0 100644
--- a/src/hb-ot-face.cc
+++ b/src/hb-ot-face.cc
@@ -35,9 +35,9 @@
#include "hb-ot-meta-table.hh"
#include "hb-ot-name-table.hh"
#include "hb-ot-post-table.hh"
-#include "hb-ot-color-cbdt-table.hh"
-#include "hb-ot-color-sbix-table.hh"
-#include "hb-ot-color-svg-table.hh"
+#include "OT/Color/CBDT/CBDT.hh"
+#include "OT/Color/sbix/sbix.hh"
+#include "OT/Color/svg/svg.hh"
#include "hb-ot-layout-gdef-table.hh"
#include "hb-ot-layout-gsub-table.hh"
#include "hb-ot-layout-gpos-table.hh"
diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index 2707109..48def88 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -43,10 +43,10 @@
#include "hb-ot-post-table.hh"
#include "hb-ot-stat-table.hh" // Just so we compile it; unused otherwise.
#include "hb-ot-vorg-table.hh"
-#include "hb-ot-color-cbdt-table.hh"
-#include "hb-ot-color-sbix-table.hh"
-#include "hb-ot-color-colr-table.hh"
-#include "hb-ot-color-svg-table.hh"
+#include "OT/Color/CBDT/CBDT.hh"
+#include "OT/Color/COLR/COLR.hh"
+#include "OT/Color/sbix/sbix.hh"
+#include "OT/Color/svg/svg.hh"
/**
diff --git a/src/hb-static.cc b/src/hb-static.cc
index eac5075..d52a4f1 100644
--- a/src/hb-static.cc
+++ b/src/hb-static.cc
@@ -33,7 +33,7 @@
#include "hb-aat-layout-feat-table.hh"
#include "hb-ot-layout-common.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-head-table.hh"
#include "hb-ot-maxp-table.hh"
diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc
index 71bc908..b7964c4 100644
--- a/src/hb-subset-plan.cc
+++ b/src/hb-subset-plan.cc
@@ -36,8 +36,8 @@
#include "hb-ot-layout-gpos-table.hh"
#include "hb-ot-layout-gsub-table.hh"
#include "hb-ot-cff1-table.hh"
-#include "hb-ot-color-colr-table.hh"
-#include "hb-ot-color-colrv1-closure.hh"
+#include "OT/Color/COLR/COLR.hh"
+#include "OT/Color/COLR/colrv1-closure.hh"
#include "hb-ot-var-fvar-table.hh"
#include "hb-ot-var-avar-table.hh"
#include "hb-ot-stat-table.hh"
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index 5315fa9..0d56b13 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -37,9 +37,10 @@
#include "hb-ot-hhea-table.hh"
#include "hb-ot-hmtx-table.hh"
#include "hb-ot-maxp-table.hh"
-#include "hb-ot-color-sbix-table.hh"
-#include "hb-ot-color-colr-table.hh"
-#include "hb-ot-color-cpal-table.hh"
+#include "OT/Color/CBDT/CBDT.hh"
+#include "OT/Color/COLR/COLR.hh"
+#include "OT/Color/CPAL/CPAL.hh"
+#include "OT/Color/sbix/sbix.hh"
#include "hb-ot-os2-table.hh"
#include "hb-ot-post-table.hh"
#include "hb-ot-post-table-v2subset.hh"
@@ -47,7 +48,6 @@
#include "hb-ot-cff2-table.hh"
#include "hb-ot-vorg-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-gpos-table.hh"
#include "hb-ot-var-fvar-table.hh"
diff --git a/src/meson.build b/src/meson.build
index 6ef32a3..676d013 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -76,11 +76,6 @@
'hb-ot-cff2-table.cc',
'hb-ot-cff2-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-face-table-list.hh',
'hb-ot-face.cc',
@@ -98,6 +93,11 @@
'hb-ot-layout-gdef-table.hh',
'hb-ot-layout-gpos-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-helpers.hh',
'OT/glyf/loca.hh',
