Commit 3fcb4cfa26e697c8c643bfc7e46b03f013394fa1
2018-05-22T09:12:21
Oops!
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h
index 13e5de7..702f77c 100644
--- a/include/freetype/config/ftheader.h
+++ b/include/freetype/config/ftheader.h
@@ -760,18 +760,6 @@
#define FT_ADVANCES_H <freetype/ftadvanc.h>
- /*************************************************************************
- *
- * @macro:
- * FT_COLOR_H
- *
- * @description:
- * A macro used in #include statements to name the file containing the
- * FreeType~2 API which handles the OpenType CPAL table.
- */
-#define FT_COLOR_H <freetype/ftcolor.h>
-
-
/* */
/* These header files don't need to be included by the user. */
diff --git a/include/freetype/ftbitmap.h b/include/freetype/ftbitmap.h
index f3acd19..cbdccc2 100644
--- a/include/freetype/ftbitmap.h
+++ b/include/freetype/ftbitmap.h
@@ -22,7 +22,6 @@
#include <ft2build.h>
#include FT_FREETYPE_H
-#include FT_COLOR_H
#ifdef FREETYPE_H
#error "freetype.h of FreeType 1 has been loaded!"
@@ -186,43 +185,6 @@ FT_BEGIN_HEADER
/*************************************************************************/
/* */
/* <Function> */
- /* FT_Bitmap_Blend */
- /* */
- /* <Description> */
- /* Blend a bitmap object from an `FT_GlyphSlot' structure onto a */
- /* bitmap in an `FT_Bitmap' structure, using a given color and */
- /* offset. */
- /* */
- /* <InOut> */
- /* target :: A handle to a bitmap object. Its type must be */
- /* @FT_PIXEL_MODE_BGRA. */
- /* */
- /* <Input> */
- /* source :: The glyph slot's source bitmap, which can have any */
- /* @FT_Pixel_Mode format. */
- /* */
- /* color :: The color used to draw `source' onto `target'. */
- /* */
- /* topleft :: A vector from the topleft corner of `source' to the */
- /* topleft corner of `target'. */
- /* */
- /* <Return> */
- /* FreeType error code. 0~means success. */
- /* */
- /* <Note> */
- /* This function reallocates the target bitmap if necessary; it */
- /* doesn't perform clipping. */
- /* */
- FT_EXPORT( FT_Error )
- FT_Bitmap_Blend( FT_Bitmap target,
- FT_GlyphSlot source,
- FT_Color color,
- FT_Vector topleft );
-
-
- /*************************************************************************/
- /* */
- /* <Function> */
/* FT_GlyphSlot_Own_Bitmap */
/* */
/* <Description> */