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

[Behdad Esfahbod]

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

New commits:
commit da83f405caeb2474e0a46f85148b3944c61a5d49
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 18 12:22:46 2008 -0400

    Tone down comment

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 2498548..8d5c2fd 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -65,7 +65,7 @@
 #ifndef FC_LCD_FILTER
 #define FC_LCD_FILTER	"lcdfilter"
 #endif
-/* Stupid Ubuntu defined FC_LCD_FILTER without defining the following */
+/* Some Ubuntu versions defined FC_LCD_FILTER without defining the following */
 #ifndef FC_LCD_NONE
 #define FC_LCD_NONE	0
 #define FC_LCD_DEFAULT	1
diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c
index 7ce252c..83015a2 100644
--- a/src/cairo-xlib-screen.c
+++ b/src/cairo-xlib-screen.c
@@ -135,7 +135,7 @@ get_integer_default (Display    *dpy,
 #ifndef FC_LCD_FILTER
 #define FC_LCD_FILTER	"lcdfilter"
 #endif
-/* Stupid Ubuntu defined FC_LCD_FILTER without defining the following */
+/* Some Ubuntu versions defined FC_LCD_FILTER without defining the following */
 #ifndef FC_LCD_NONE
 #define FC_LCD_NONE	0
 #define FC_LCD_DEFAULT	1
commit 5379af109ca65c40ea2b7a74b7660267da7c8d2f
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Aug 18 12:22:34 2008 -0400

    [cairo-ft] Add useless cairo_warn decorator

diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 0b75243..2498548 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -561,7 +561,7 @@ _has_unlocked_face (void *entry)
  * This differs from _cairo_ft_scaled_font_lock_face in that it doesn't
  * set the scale on the face, but just returns it at the last scale.
  */
-FT_Face
+cairo_warn FT_Face
 _cairo_ft_unscaled_font_lock_face (cairo_ft_unscaled_font_t *unscaled)
 {
     cairo_ft_unscaled_font_map_t *font_map;