[cairo-commit] 3 commits - build/.gitignore src/cairo-ft-font.c src/cairo-scaled-font.c src/.gitignore

[Behdad Esfahbod]

 build/.gitignore        |    2 ++
 src/.gitignore          |    1 +
 src/cairo-ft-font.c     |    2 +-
 src/cairo-scaled-font.c |    8 +++++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit e4d7c87b5e449a743a68dd256faaa3242f191a44
Author: Karl Tomlinson <karlt+ at karlt.net>
Date:   Wed Dec 17 16:40:12 2008 -0500

    [ft] Don't call FT_Done_Face() on faces we did not create

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index bc23a3d..f438fb9 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -540,7 +540,7 @@ _has_unlocked_face (void *entry)
 {
     cairo_ft_unscaled_font_t *unscaled = entry;
 
-    return (unscaled->lock_count == 0 && unscaled->face);
+    return (!unscaled->from_face && unscaled->lock_count == 0 && unscaled->face);
 }
 
 /* Ensures that an unscaled font has a face object. If we exceed
commit 6778a5f67ae2e35e809cf4464530e2bb05870378
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Dec 17 16:19:45 2008 -0500

    [.gitignore] Update

diff --git a/build/.gitignore b/build/.gitignore
index 8b6b308..391c14e 100644
--- a/build/.gitignore
+++ b/build/.gitignore
@@ -8,3 +8,5 @@ missing
 mkinstalldirs
 Makefile.win32.features
 Makefile.win32.features-h
+libtool.m4
+lt*.m4
diff --git a/src/.gitignore b/src/.gitignore
index 932e397..d96c4d4 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -30,4 +30,5 @@ TAGS
 tags
 check-has-hidden-symbols.i
 check-link
+check-skiplist
 headers-standalone
commit 26f471999973c538e45db0ae9f0227fbe5dedf24
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed Dec 17 16:08:32 2008 -0500

    [scaled-font] Improve docs

diff --git a/src/cairo-scaled-font.c b/src/cairo-scaled-font.c
index 4d43c35..5758388 100644
--- a/src/cairo-scaled-font.c
+++ b/src/cairo-scaled-font.c
@@ -248,6 +248,7 @@ _cairo_scaled_font_set_error (cairo_scaled_font_t *scaled_font,
  *
  * This function returns the type of the backend used to create
  * a scaled font. See #cairo_font_type_t for available types.
+ * However, this function never returns #CAIRO_FONT_TYPE_TOY.
  *
  * Return value: The type of @scaled_font.
  *
@@ -2461,7 +2462,9 @@ _cairo_scaled_font_get_max_scale (cairo_scaled_font_t *scaled_font)
  * cairo_scaled_font_get_font_face:
  * @scaled_font: a #cairo_scaled_font_t
  *
- * Gets the font face that this scaled font was created for.
+ * Gets the font face that this scaled font uses.  This is the
+ * font face passed to cairo_scaled_font_create() if that font face
+ * was not of type #CAIRO_FONT_TYPE_TOY.
  *
  * Return value: The #cairo_font_face_t with which @scaled_font was
  * created.
@@ -2507,6 +2510,9 @@ slim_hidden_def (cairo_scaled_font_get_font_matrix);
  * @ctm: return value for the CTM
  *
  * Stores the CTM with which @scaled_font was created into @ctm.
+ * Note that the translation offsets (x0, y0) of the CTM are ignored
+ * by cairo_scaled_font_create().  So, the matrix this function
+ * returns always has 0,0 as x0,y0.
  *
  * Since: 1.2
  **/