[ot-color] Move the related tables to hb-ot-color-* (#858)

src/Makefile.sources

@@ -97,8 +97,8 @@ HB_OT_sources = \
 	hb-ot-layout-jstf-table.hh \
 	hb-ot-layout-private.hh \
 	hb-ot-color.cc \
-	hb-ot-colr-table.hh \
-	hb-ot-cpal-table.hh \
+	hb-ot-color-colr-table.hh \
+	hb-ot-color-cpal-table.hh \
 	hb-ot-map.cc \
 	hb-ot-map-private.hh \
 	hb-ot-math.cc \

src/hb-ot-color-colr-table.hh

@@ -22,8 +22,8 @@
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  */
 
-#ifndef HB_OT_COLR_TABLE_HH
-#define HB_OT_COLR_TABLE_HH
+#ifndef HB_OT_COLOR_COLR_TABLE_HH
+#define HB_OT_COLOR_COLR_TABLE_HH
 
 #include "hb-open-type-private.hh"
 
@@ -134,4 +134,4 @@ struct COLR
 } /* namespace OT */
 
 
-#endif /* HB_OT_COLR_TABLE_HH */
+#endif /* HB_OT_COLOR_COLR_TABLE_HH */

src/hb-ot-color-cpal-table.hh

@@ -25,8 +25,8 @@
  * Google Author(s): Sascha Brawer
  */
 
-#ifndef HB_OT_CPAL_TABLE_HH
-#define HB_OT_CPAL_TABLE_HH
+#ifndef HB_OT_COLOR_CPAL_TABLE_HH
+#define HB_OT_COLOR_CPAL_TABLE_HH
 
 #include "hb-open-type-private.hh"
 
@@ -176,4 +176,4 @@ struct CPAL
 } /* namespace OT */
 
 
-#endif /* HB_OT_CPAL_TABLE_HH */
+#endif /* HB_OT_COLOR_CPAL_TABLE_HH */

src/hb-ot-color.cc

@@ -26,8 +26,8 @@
  */
 
 #include "hb-open-type-private.hh"
-#include "hb-ot-colr-table.hh"
-#include "hb-ot-cpal-table.hh"
+#include "hb-ot-color-colr-table.hh"
+#include "hb-ot-color-cpal-table.hh"
 #include "hb-ot.h"
 
 #include <stdlib.h>

src/hb-ot-layout.cc

@@ -37,8 +37,8 @@
 #include "hb-ot-layout-gpos-table.hh"
 #include "hb-ot-layout-jstf-table.hh" // Just so we compile it; unused otherwise.
 #include "hb-ot-name-table.hh" // Just so we compile it; unused otherwise.
-#include "hb-ot-colr-table.hh"
-#include "hb-ot-cpal-table.hh"
+#include "hb-ot-color-colr-table.hh"
+#include "hb-ot-color-cpal-table.hh"
 
 #include "hb-ot-map-private.hh"