[cairo-commit] src/cairo-ps-surface.c src/cairo-scaled-font-subsets-private.h

[Adrian Johnson]

 src/cairo-ps-surface.c                  |   19 -------------------
 src/cairo-scaled-font-subsets-private.h |    5 -----
 2 files changed, 24 deletions(-)

New commits:
commit 4fd20fe903ebd698ec6d6fe0741d3dffb4eca74f
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Wed Jul 20 08:37:03 2011 +0930

    Remove HAS_FT_FONT from cairo-scaled-font-subsets-private.h
    
    Should have been removed when the FT dependency was removed from type 1.

diff --git a/src/cairo-ps-surface.c b/src/cairo-ps-surface.c
index 80ad474..3d939c9 100644
--- a/src/cairo-ps-surface.c
+++ b/src/cairo-ps-surface.c
@@ -339,8 +339,6 @@ _cairo_ps_surface_emit_header (cairo_ps_surface_t *surface)
     }
 }
 
-#if CAIRO_HAS_FT_FONT
-
 static cairo_status_t
 _cairo_ps_surface_emit_type1_font_subset (cairo_ps_surface_t		*surface,
 					  cairo_scaled_font_subset_t	*font_subset)
@@ -403,23 +401,6 @@ _cairo_ps_surface_emit_type1_font_fallback (cairo_ps_surface_t		*surface,
 
     return CAIRO_STATUS_SUCCESS;
 }
-#else
-
-static cairo_status_t
-_cairo_ps_surface_emit_type1_font_subset (cairo_ps_surface_t		*surface,
-					  cairo_scaled_font_subset_t	*font_subset)
-{
-    return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-static cairo_status_t
-_cairo_ps_surface_emit_type1_font_fallback (cairo_ps_surface_t		*surface,
-                                            cairo_scaled_font_subset_t	*font_subset)
-{
-    return CAIRO_INT_STATUS_UNSUPPORTED;
-}
-
-#endif
 
 static cairo_status_t
 _cairo_ps_surface_emit_truetype_font_subset (cairo_ps_surface_t		*surface,
diff --git a/src/cairo-scaled-font-subsets-private.h b/src/cairo-scaled-font-subsets-private.h
index 1504eaa..92f0020 100644
--- a/src/cairo-scaled-font-subsets-private.h
+++ b/src/cairo-scaled-font-subsets-private.h
@@ -512,8 +512,6 @@ typedef struct _cairo_type1_subset {
 } cairo_type1_subset_t;
 
 
-#if CAIRO_HAS_FT_FONT
-
 /**
  * _cairo_type1_subset_init:
  * @type1_subset: a #cairo_type1_subset_t to initialize
@@ -547,9 +545,6 @@ _cairo_type1_subset_init (cairo_type1_subset_t		*type_subset,
 cairo_private void
 _cairo_type1_subset_fini (cairo_type1_subset_t *subset);
 
-#endif /* CAIRO_HAS_FT_FONT */
-
-
 /**
  * _cairo_type1_scaled_font_is_type1:
  * @scaled_font: a #cairo_scaled_font_t