From c446c23f0f09e541891b49184febdfc75cb3505f Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Sat, 3 Mar 2018 22:43:23 +0330
Subject: [PATCH] [ot-color] Move the related tables to hb-ot-color-* (#858)

---
 src/Makefile.sources                                   | 4 ++--
 src/{hb-ot-colr-table.hh => hb-ot-color-colr-table.hh} | 6 +++---
 src/{hb-ot-cpal-table.hh => hb-ot-color-cpal-table.hh} | 6 +++---
 src/hb-ot-color.cc                                     | 4 ++--
 src/hb-ot-layout.cc                                    | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)
 rename src/{hb-ot-colr-table.hh => hb-ot-color-colr-table.hh} (97%)
 rename src/{hb-ot-cpal-table.hh => hb-ot-color-cpal-table.hh} (97%)

diff --git a/src/Makefile.sources b/src/Makefile.sources
index a3bd15654..cb4a63c0d 100644
--- a/src/Makefile.sources
+++ b/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 \
diff --git a/src/hb-ot-colr-table.hh b/src/hb-ot-color-colr-table.hh
similarity index 97%
rename from src/hb-ot-colr-table.hh
rename to src/hb-ot-color-colr-table.hh
index 0a2b80e58..f9d65aa80 100644
--- a/src/hb-ot-colr-table.hh
+++ b/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 */
diff --git a/src/hb-ot-cpal-table.hh b/src/hb-ot-color-cpal-table.hh
similarity index 97%
rename from src/hb-ot-cpal-table.hh
rename to src/hb-ot-color-cpal-table.hh
index 5adbbea46..135862d44 100644
--- a/src/hb-ot-cpal-table.hh
+++ b/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 */
diff --git a/src/hb-ot-color.cc b/src/hb-ot-color.cc
index da4fa4087..ceebe0b7a 100644
--- a/src/hb-ot-color.cc
+++ b/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>
diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index e4cb68d8f..1c9e950b2 100644
--- a/src/hb-ot-layout.cc
+++ b/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"