Merge branch 'colour-font' into libraqm-full

Author: QuLogic

lib/matplotlib/backends/backend_agg.py

@@ -184,7 +184,7 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
                 font.get_char_index(char),
                 # The "y" parameter is upwards (per FreeType).
                 x + dx * c - dy * s, self.height - y + dx * s + dy * c, angle,
-                get_hinting_flag())
+                get_hinting_flag() | LoadFlags.COLOR)
             # draw_text_image's y is downwards & the bitmap bottom side.
             self._renderer.draw_text_image(
                 bitmap["buffer"],
@@ -218,15 +218,28 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
         if ismath:
             return self.draw_mathtext(gc, x, y, s, prop, angle)
         font = self._prepare_font(prop)
-        font.set_text(s, 0, flags=get_hinting_flag(),
+        font.set_text(s, 0, flags=get_hinting_flag() | LoadFlags.COLOR,
                       features=mtext.get_fontfeatures() if mtext is not None else None,
                       language=mtext.get_language() if mtext is not None else None)
         for bitmap in font._render_glyphs(x, self.height - y):
-            self._renderer.draw_text_image(
-                bitmap["buffer"],
-                bitmap["left"],
-                int(self.height) - bitmap["top"] + bitmap["buffer"].shape[0],
-                0, gc)
+            # glyph_index = font.get_char_index(ord(c))
+            # glyph = font.load_glyph(glyph_index)
+            # bitmap = font._render_glyph(
+            #     glyph_index, x, self.height - y, angle,
+            #     get_hinting_flag() | LoadFlags.COLOR)
+            if bitmap["buffer"].ndim == 3:
+                self._renderer.draw_image(
+                    gc,
+                    bitmap["left"],
+                    bitmap["top"] - bitmap["buffer"].shape[0],
+                    bitmap["buffer"][::-1, :, [2, 1, 0, 3]])
+            else:
+                self._renderer.draw_text_image(
+                    bitmap["buffer"],
+                    bitmap["left"],
+                    int(self.height) - bitmap["top"] + bitmap["buffer"].shape[0],
+                    0, gc)
+            # x += glyph.horiAdvance / 64
 
     def get_text_width_height_descent(self, s, prop, ismath):
         # docstring inherited

src/ft2font_wrapper.cpp

@@ -1871,10 +1871,18 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used())
             py::dict d;
             d["left"] = face->glyph->bitmap_left;
             d["top"] = face->glyph->bitmap_top;
-            d["buffer"] = py::array_t<uint8_t>{
-                {face->glyph->bitmap.rows, face->glyph->bitmap.width},
-                {face->glyph->bitmap.pitch, 1},
-                face->glyph->bitmap.buffer};
+            if (face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA) {
+                d["buffer"] = py::array_t<uint8_t>{
+                    py::array::ShapeContainer({face->glyph->bitmap.rows,
+                                               face->glyph->bitmap.width, 4}),
+                    py::array::StridesContainer({face->glyph->bitmap.pitch, 4, 1}),
+                    face->glyph->bitmap.buffer};
+            } else {
+                d["buffer"] = py::array_t<uint8_t>{
+                    {face->glyph->bitmap.rows, face->glyph->bitmap.width},
+                    {face->glyph->bitmap.pitch, 1},
+                    face->glyph->bitmap.buffer};
+            }
             return d;
         })
         .def("_render_glyphs", [](PyFT2Font *self, double x, double y) {
@@ -1886,10 +1894,17 @@ PYBIND11_MODULE(ft2font, m, py::mod_gil_not_used())
                 py::dict d;
                 d["left"] = bg->left;
                 d["top"] = bg->top;
-                d["buffer"] = py::array_t<uint8_t>{
-                    {bg->bitmap.rows, bg->bitmap.width},
-                    {bg->bitmap.pitch, 1},
-                    bg->bitmap.buffer};
+                if (bg->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA) {
+                    d["buffer"] = py::array_t<uint8_t>{
+                        py::array::ShapeContainer({bg->bitmap.rows, bg->bitmap.width, 4}),
+                        py::array::StridesContainer({bg->bitmap.pitch, 4, 1}),
+                        bg->bitmap.buffer};
+                } else {
+                    d["buffer"] = py::array_t<uint8_t>{
+                        {bg->bitmap.rows, bg->bitmap.width},
+                        {bg->bitmap.pitch, 1},
+                        bg->bitmap.buffer};
+                }
                 gs.append(d);
             }
             return gs;