[cairo-commit] 2 commits - ROADMAP src/cairo-ft-font.c

[罗晶华 Jinghua Luo]

 ROADMAP             |    4 ++--
 src/cairo-ft-font.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 61a3260e44b40b8aa344f806979b60a82400105e (from 0d2900477cd6edfe6025be06c3f1eda63cbe5230)
Author: Jinghua Luo <sunmoon1997 at gmail.com>
Date:   Wed Jun 14 15:57:23 2006 +0800

    ROADMAP: Mark bugs FC_ADVANCE and _transform_glyph_bitmap as fixed.

diff --git a/ROADMAP b/ROADMAP
index ee448b2..092313a 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -54,9 +54,9 @@ We don't expect to release without these
  Bug fixes (For each XXXX, see: https://bugs.freedesktop.org/show_bug.cgi?id=XXXX )
      4630  Fonts too large when drawing to image surface while printing
      4863  stroking problems with wide dashed lines
-	   FC_GLOBAL_ADVANCE (http://lists.freedesktop.org/archives/cairo/2005-August/004893.html)
+    ✓ 	      FC_GLOBAL_ADVANCE (http://lists.freedesktop.org/archives/cairo/2005-August/004893.html)
     ✓4705  crash at XRenderAddGlyphs
-	   _transform_glyph_bitmap http://lists.freedesktop.org/archives/cairo/2005-October/005564.html
+    ✓   	      _transform_glyph_bitmap http://lists.freedesktop.org/archives/cairo/2005-October/005564.html
      6759  fontconfig option AntiAlias doesn't work in cairo 1.1.2
 	   SVG/PS/PDF emit_glyph functions need to support bitmapped glyphs
 
diff-tree 0d2900477cd6edfe6025be06c3f1eda63cbe5230 (from b104a79502e2c01c508e40d83613ecfa001a2a4e)
Author: Jinghua Luo <sunmoon1997 at gmail.com>
Date:   Wed Jun 14 15:56:17 2006 +0800

    freetype: Return an error if the glyph format isn't outline or bitmap
    while getting glyph surface.

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index fd2c899..1ffdea0 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1886,6 +1886,7 @@ _cairo_ft_scaled_glyph_init (void			*abs
     if ((info & CAIRO_SCALED_GLYPH_INFO_SURFACE) != 0) {
 	cairo_image_surface_t	*surface;
 	cairo_status_t status;
+
 	if (glyph->format == FT_GLYPH_FORMAT_OUTLINE)
 	    status = _render_glyph_outline (face, &scaled_font->base.options,
 					    &surface);
@@ -1896,8 +1897,7 @@ _cairo_ft_scaled_glyph_init (void			*abs
 		status = _transform_glyph_bitmap (&unscaled->current_shape,
 						  &surface);
 	} else
-	    status = _render_glyph_bitmap (face, &scaled_font->base.options,
-					   &surface);
+	    status = CAIRO_STATUS_NO_MEMORY;
 	if (status) {
 	    cairo_ft_scaled_font_unlock_face (abstract_font);
 	    return status;