Color glyph framework and rendering (1/3).

* include/freetype/fttypes.h (FT_Color): Move here...
* include/freetype/ftcolor.h (FT_Color): ...from here.

3 files changed, 44 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 4ad8e5cc7..fabcd1518 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-12-11  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+	Color glyph framework and rendering (1/3).
+
+	* include/freetype/fttypes.h (FT_Color): Move here...
+	* include/freetype/ftcolor.h (FT_Color): ...from here.
+
 2018-12-11  Werner Lemberg  <wl@gnu.org>
 
 	* src/truetype/ttgload.c (TT_Hint_Glyph): Remove useless test.
diff --git a/include/freetype/ftcolor.h b/include/freetype/ftcolor.h
index 93df3a2fd..2780661e9 100644
--- a/include/freetype/ftcolor.h
+++ b/include/freetype/ftcolor.h
@@ -51,43 +51,6 @@ FT_BEGIN_HEADER
 
   /**************************************************************************
    *
-   * @struct:
-   *   FT_Color
-   *
-   * @description:
-   *   This structure models a BGRA color value of a `CPAL` palette entry.
-   *
-   *   The used color space is sRGB; the colors are not pre-multiplied, and
-   *   alpha values must be explicitly set.
-   *
-   * @fields:
-   *   blue ::
-   *     Blue value.
-   *
-   *   green ::
-   *     Green value.
-   *
-   *   red ::
-   *     Red value.
-   *
-   *   alpha ::
-   *     Alpha value, giving the red, green, and blue color's opacity.
-   *
-   * @since:
-   *   2.10
-   */
-  typedef struct  FT_Color_
-  {
-    FT_Byte  blue;
-    FT_Byte  green;
-    FT_Byte  red;
-    FT_Byte  alpha;
-
-  } FT_Color;
-
-
-  /**************************************************************************
-   *
    * @enum:
    *   FT_PALETTE_XXX
    *
diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h
index b20879b62..6086d8130 100644
--- a/include/freetype/fttypes.h
+++ b/include/freetype/fttypes.h
@@ -398,6 +398,43 @@ FT_BEGIN_HEADER
   /**************************************************************************
    *
    * @struct:
+   *   FT_Color
+   *
+   * @description:
+   *   This structure models a BGRA color value.
+   *
+   *   The used color space is sRGB; the colors are not pre-multiplied, and
+   *   alpha values must be explicitly set.
+   *
+   * @fields:
+   *   blue ::
+   *     Blue value.
+   *
+   *   green ::
+   *     Green value.
+   *
+   *   red ::
+   *     Red value.
+   *
+   *   alpha ::
+   *     Alpha value, giving the red, green, and blue color's opacity.
+   *
+   * @since:
+   *   2.10
+   */
+  typedef struct  FT_Color_
+  {
+    FT_Byte  blue;
+    FT_Byte  green;
+    FT_Byte  red;
+    FT_Byte  alpha;
+
+  } FT_Color;
+
+
+  /**************************************************************************
+   *
+   * @struct:
    *   FT_Data
    *
    * @description: