[cairo-commit] 6 commits - configure.in ROADMAP src/cairo-ft-font.c src/cairo-xlib-surface.c src/Makefile.am test/pdf2png.c

Carl Worth cworth at kemper.freedesktop.org
Wed Jun 14 04:54:53 PDT 2006


 ROADMAP                  |   32 +++++++++++++++++++-------------
 configure.in             |    2 +-
 src/Makefile.am          |    2 ++
 src/cairo-ft-font.c      |    7 +++----
 src/cairo-xlib-surface.c |    3 +++
 test/pdf2png.c           |    1 +
 6 files changed, 29 insertions(+), 18 deletions(-)

New commits:
diff-tree 211741cce61075b526edfacd728c9c5de8dd1aac (from b8e93f9c5598d5452e08728546677a977e41617f)
Author: Bertram Felgenhauer <bertram.felgenhauer at googlemail.com>
Date:   Wed Jun 14 04:51:27 2006 -0700

    Bug 4723: configure.in: Fix m4 quoting when examining pkg-config version

diff --git a/configure.in b/configure.in
index 1335e4c..d415008 100644
--- a/configure.in
+++ b/configure.in
@@ -603,7 +603,7 @@ dnl ====================================
 dnl Check for recent pkg-config which supports Requires.private
 
 case `$PKG_CONFIG --version` in
-0.?|0.1[0-7]) PKGCONFIG_REQUIRES="Requires"; ;;
+[0.?|0.?.?|0.1[0-7]|0.1[0-7].?]) PKGCONFIG_REQUIRES="Requires"; ;;
 *) PKGCONFIG_REQUIRES="Requires.private"; ;;
 esac
 
diff-tree b8e93f9c5598d5452e08728546677a977e41617f (from 32d049a7bf9549f8c797c50654546b6526518f0a)
Author: Brian Cameron <brian.cameron at sun.com>
Date:   Wed Jun 14 04:44:01 2006 -0700

    Bug 4882: Flag Sun's X server has having buggy_repeat.
    
    This is the Sun labelling of Xorg 6.8 as shipped with Solaris 10.

diff --git a/src/cairo-xlib-surface.c b/src/cairo-xlib-surface.c
index ad00416..6ec2574 100644
--- a/src/cairo-xlib-surface.c
+++ b/src/cairo-xlib-surface.c
@@ -1868,6 +1868,9 @@ _cairo_xlib_surface_create_internal (Dis
     } else if (strstr (ServerVendor (dpy), "XFree86") != NULL) {
 	if (VendorRelease (dpy) <= 40500000)
 	    surface->buggy_repeat = TRUE;
+    } else if (strstr (ServerVendor (dpy), "Sun Microsystems, Inc.") != NULL) {
+	if (VendorRelease (dpy) <= 60800000)
+	    surface->buggy_repeat = TRUE;
     }
 
     surface->dst_picture = None;
diff-tree 32d049a7bf9549f8c797c50654546b6526518f0a (from e9269aefcbc96a417012107c17ec2bc4de608cc1)
Author: Dom Lachowicz <cinamod at hotmail.com>
Date:   Wed Jun 14 04:37:08 2006 -0700

    Bug 5306: test/pdf2png: Add missing include of stdio.h

diff --git a/test/pdf2png.c b/test/pdf2png.c
index 3edb17c..543a996 100644
--- a/test/pdf2png.c
+++ b/test/pdf2png.c
@@ -23,6 +23,7 @@
  * Author: Kristian Høgsberg <krh at redhat.com>
  */
 
+#include <stdio.h>
 #include <stdlib.h>
 #include <poppler.h>
 
diff-tree e9269aefcbc96a417012107c17ec2bc4de608cc1 (from c8e7ff096648a53b780f14c2cd2467157fae8385)
Author: Behdad Esfahbod <freedesktop at behdad.org>
Date:   Wed Jun 14 04:07:29 2006 -0700

    Bug 7075: Fix make clean to remove cairo.def

diff --git a/src/Makefile.am b/src/Makefile.am
index c982244..2141113 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -233,3 +233,5 @@ install-data-local:
 	  echo "****************************************************************" ;	\
 	  false ;									\
         fi
+
+CLEANFILES = cairo.def
diff-tree c8e7ff096648a53b780f14c2cd2467157fae8385 (from c515b15cfc8c88b330f16a9263841476c29ded99)
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jun 14 04:04:21 2006 -0700

    ROADMAP: Update with PDF bugs from minefield test. Slip non-1.0 regressions off of 1.2.

diff --git a/ROADMAP b/ROADMAP
index 092313a..1cfab2f 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -52,23 +52,15 @@ cairo 1.2.0 essential features
 We don't expect to release without these being complete.
 ========================================================
  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)
-    ✓4705  crash at XRenderAddGlyphs
-    ✓   	      _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
+	   PDF: minefield page one is falling back unnecessarily
+	   PDF: minefield shows too-tiny bitmapped fonts in image fallback
+	   PDF: minefield shows strangely hinted type3 glyph shapes
 
  Fix memory leaks
      1. Ensure 'make check-valgrind' passes with no leaks
 
- Performance improvements
-    ✓1. Speed up glyph measurement (cache rewrite)
-     2. Speed up gradient computations
-	✓a. Better software gradients
-	 b. Use X server gradients when available
-
  cairo 1.1.8 snapshot includes everything below here
  ---------------------------------------------------
 ✓PDF backend
@@ -86,6 +78,12 @@ We don't expect to release without these
 	✓  cairo_{ps,pdf}_surface_set_dpi have no effect (replace with cairo_surface_set_fallback_resolution)
 	✓ cairo_set_line_width semantics (that's not a bug, it's a feature)
 
+✓Bug fixes (For each XXXX, see: https://bugs.freedesktop.org/show_bug.cgi?id=XXXX )
+    ✓ 	   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
+
+
  cairo 1.1.6 snapshot includes everything below here
  ---------------------------------------------------
 ✓Printing-oriented API (PDF)
@@ -101,7 +99,7 @@ We don't expect to release without these
     ✓1. Per-page settings (paper size, layout, anything else?)
     ✓2. Document metadata
 
-✓PS backend
+p✓PS backend
     ✓1. Mark PS backend as supported:
 	✓a. Incorporate into test suite
 	✓b. Correct output for the entire test suite
@@ -119,6 +117,11 @@ We don't expect to release without these
     ✓1. Add experimental SVG backend
     ✓2. Incorporate into test suite
 
+✓Performance improvements
+    ✓1. Speed up glyph measurement (cache rewrite)
+    ✓2. Speed up gradient computations
+	✓a. Better software gradients
+
 cairo 1.2.0 desired features
 If these aren't ready, they won't be in the release.
 ======================================================
@@ -142,7 +145,9 @@ If these aren't ready, they won't be in 
 	(Submitted upstream: https://bugs.freedesktop.org/show_bug.cgi?id=5845)
 
  Bug fixes
-     2. Fix some expected failures (XFAIL) in the test suite
+     4630  Fonts too large when drawing to image surface while printing
+     4863  stroking problems with wide dashed lines
+     Fix some expected failures (XFAIL) in the test suite
 	 a. a8-mask
 	✓b. clip-all
 	 c. filter-nearest-offset
@@ -157,6 +162,7 @@ If these aren't ready, they won't be in 
  Performance improvements
      1. Cull and trim trapezoids outside clip region bounds
      2. Generate more large pixel-aligned, rectangular trapezoids
+     3. Use X server gradients when available
 
 Longer-term desired stuff for cairo (not scheduled for any particular release)
 ==============================================================================
diff-tree c515b15cfc8c88b330f16a9263841476c29ded99 (from 61a3260e44b40b8aa344f806979b60a82400105e)
Author: Carl Worth <cworth at cworth.org>
Date:   Wed Jun 14 03:53:18 2006 -0700

    ft: If glyph->format is not OUTLINE use _render_glyph_bitmap to coerce to a bitmap

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 1ffdea0..c5fb728 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1887,17 +1887,16 @@ _cairo_ft_scaled_glyph_init (void			*abs
 	cairo_image_surface_t	*surface;
 	cairo_status_t status;
 
-	if (glyph->format == FT_GLYPH_FORMAT_OUTLINE)
+	if (glyph->format == FT_GLYPH_FORMAT_OUTLINE) {
 	    status = _render_glyph_outline (face, &scaled_font->base.options,
 					    &surface);
-	else if (glyph->format == FT_GLYPH_FORMAT_BITMAP) {
+	} else {
 	    status = _render_glyph_bitmap (face, &scaled_font->base.options,
 					   &surface);
 	    if (status == CAIRO_STATUS_SUCCESS && unscaled->have_shape)
 		status = _transform_glyph_bitmap (&unscaled->current_shape,
 						  &surface);
-	} else
-	    status = CAIRO_STATUS_NO_MEMORY;
+	}
 	if (status) {
 	    cairo_ft_scaled_font_unlock_face (abstract_font);
 	    return status;


More information about the cairo-commit mailing list