[cairo-commit] 3 commits - configure.in src/cairo-ft-font.c src/cairo-os2-surface.c

[Behdad Esfahbod]

 configure.in            |    4 ++++
 src/cairo-ft-font.c     |    6 +++++-
 src/cairo-os2-surface.c |    2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit d560a3d96563d681f5c0d8ebea0d255ac35bbc99
Author: Peter Weilbacher <mozilla at Weilbacher.org>
Date:   Fri Jul 25 11:19:11 2008 -0400

    [OS/2] Fix build

diff --git a/src/cairo-os2-surface.c b/src/cairo-os2-surface.c
index b0c2731..80a1cd9 100644
--- a/src/cairo-os2-surface.c
+++ b/src/cairo-os2-surface.c
@@ -137,7 +137,7 @@ cairo_os2_fini (void)
 
     /* Free allocated memories! */
     /* (Check cairo_debug_reset_static_data () for an example of this!) */
-    _cairo_font_reset_static_data ();
+    _cairo_font_face_reset_static_data ();
 #if CAIRO_HAS_FT_FONT
     _cairo_ft_font_reset_static_data ();
 #endif
commit ba95b9dee8e6daddbeb0660d920c7b46801edc80
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 21 16:34:10 2008 -0400

    [cairo-ft] Use FcFreeTypeCharIndex instead of FT_Get_Char_Index

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 4620653..293ca76 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -2140,7 +2140,11 @@ _cairo_ft_ucs4_to_index (void	    *abstract_font,
     face = _cairo_ft_unscaled_font_lock_face (unscaled);
     if (!face)
 	return 0;
-    index = FT_Get_Char_Index (face, ucs4);
+
+    /* If making this compile without fontconfig, use:
+     * index = FT_Get_Char_Index (face, ucs4); */
+    index = FcFreeTypeCharIndex (face, ucs4);
+
     _cairo_ft_unscaled_font_unlock_face (unscaled);
     return index;
 }
commit bc42989501e8e604cbf8eb5348d4eb86d5a7cc4b
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 21 16:29:57 2008 -0400

    [configure.in] Cosmetic

diff --git a/configure.in b/configure.in
index d7fc160..9d3b9cc 100644
--- a/configure.in
+++ b/configure.in
@@ -651,6 +651,8 @@ CAIRO_BACKEND_ENABLE(ps, PostScript, ps, PS_SURFACE, yes, [
     ps_NONPKGCONFIG_LIBS=-lz
 ])
 
+dnl ===========================================================================
+
 test_ps=no
 if test "x$use_ps" = "xyes"; then
   AC_CHECK_PROG(GS, gs, gs)
@@ -673,6 +675,8 @@ CAIRO_BACKEND_ENABLE(pdf, PDF, pdf, PDF_SURFACE, yes, [
     pdf_NONPKGCONFIG_LIBS=-lz
 ])
 
+dnl ===========================================================================
+
 POPPLER_VERSION_REQUIRED=0.8.0
 test_pdf=no
 if test "x$use_pdf" = "xyes"; then