[cairo-commit] src/cairo-type1-subset.c test/ft-text-vertical-layout-type1-ps-argb32-ref.png test/Makefile.am

[Behdad Esfahbod]

 src/cairo-type1-subset.c                             |    3 +++
 test/Makefile.am                                     |    2 +-
 test/ft-text-vertical-layout-type1-ps-argb32-ref.png |binary
 3 files changed, 4 insertions(+), 1 deletion(-)

New commits:
diff-tree 50efd71935d0aa8d5b780b3ea2c3fd4c5333ca82 (from 207e38e8ba009a5e4d7994ee490d478c6a695336)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sun Dec 17 18:35:16 2006 -0500

    [type1-subset] Return UNSUPPORTED for vertical fonts
    
    This fixes the last problem with vertical fonts in PS/PDF.  As such, remove
    ft-text-vertical-layout-type1 test from XFAIL and add PS-specific ref image
    to pass.

diff --git a/src/cairo-type1-subset.c b/src/cairo-type1-subset.c
index 6e9afab..08a2d22 100644
--- a/src/cairo-type1-subset.c
+++ b/src/cairo-type1-subset.c
@@ -1008,6 +1008,9 @@ _cairo_type1_subset_init (cairo_type1_su
     if (!_cairo_scaled_font_is_ft (scaled_font_subset->scaled_font))
 	return CAIRO_INT_STATUS_UNSUPPORTED;
 
+    if (_cairo_ft_scaled_font_is_vertical (scaled_font_subset->scaled_font))
+        return CAIRO_INT_STATUS_UNSUPPORTED;
+
     unscaled_font = _cairo_ft_scaled_font_get_unscaled_font (scaled_font_subset->scaled_font);
 
     status = _cairo_type1_font_subset_create (unscaled_font, &font, hex_encode);
diff --git a/test/Makefile.am b/test/Makefile.am
index 8861bcd..6dd82cb 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -229,6 +229,7 @@ filter-nearest-offset-ref.png				\
 ft-text-antialias-none-ref.png				\
 ft-text-antialias-none-ps-argb32-ref.png		\
 ft-text-vertical-layout-type1-ref.png			\
+ft-text-vertical-layout-type1-ps-argb32-ref.png		\
 ft-text-vertical-layout-type1-svg-ref.png		\
 ft-text-vertical-layout-type3-ref.png			\
 ft-text-vertical-layout-type3-ps-argb32-ref.png		\
@@ -344,7 +345,6 @@ a8-mask				\
 big-trap			\
 extend-reflect			\
 filter-nearest-offset		\
-ft-text-vertical-layout-type1	\
 leaky-dash			\
 long-lines			\
 self-intersecting		\
diff --git a/test/ft-text-vertical-layout-type1-ps-argb32-ref.png b/test/ft-text-vertical-layout-type1-ps-argb32-ref.png
new file mode 100644
index 0000000..bc71bbc
Binary files /dev/null and b/test/ft-text-vertical-layout-type1-ps-argb32-ref.png differ