[cairo-commit] 2 commits - src/cairo-ft-font.c
ç½—æ™¶åŽ Jinghua Luo
jinghua at kemper.freedesktop.org
Sun Jun 11 03:17:11 PDT 2006
src/cairo-ft-font.c | 69 +++++++++++++++++++++++++---------------------------
1 files changed, 34 insertions(+), 35 deletions(-)
New commits:
diff-tree 4af28e639dcf7fe3332c0302295e6d590a505af7 (from f5bc26b75dd030ada70f87113e2d132dfcb0b0f3)
Author: Jinghua Luo <sunmoon1997 at gmail.com>
Date: Sun Jun 11 18:16:46 2006 +0800
ignore FC_MATRIX in font pattern.
With previous commit, freetype font backend is able to transform
both bitmap and outline glyphs, so ignores FC_MATRIX from now,
cairo doesn't need this for artificial oblique. And cairo doesn't
use FC_MATRIX direct anyway, it has its own font matrix that may be not
equal to FC_MATRIX in the font pattern! You should pass the matrix
(usually the matrix is multiplied by font's pixel size) to cairo when
creating scaled font.
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 398b894..7ec8145 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -1230,8 +1230,6 @@ static cairo_ft_options_t
_get_pattern_ft_options (FcPattern *pattern)
{
FcBool antialias, vertical_layout, hinting, autohint, bitmap;
- FcBool transform;
- FcMatrix *font_matrix;
cairo_ft_options_t ft_options;
int rgba;
#ifdef FC_HINT_STYLE
@@ -1246,13 +1244,6 @@ _get_pattern_ft_options (FcPattern *patt
#define FC_EMBEDDED_BITMAP "embeddedbitmap"
#endif
- if (FcPatternGetMatrix (pattern,
- FC_MATRIX, 0, &font_matrix) != FcResultMatch)
- font_matrix = NULL;
-
- transform = (font_matrix && (font_matrix->xx != 1 || font_matrix->xy != 0 ||
- font_matrix->yx != 0 || font_matrix->yy != 1));
-
/* Check whether to force use of embedded bitmaps */
if (FcPatternGetBool (pattern,
FC_EMBEDDED_BITMAP, 0, &bitmap) != FcResultMatch)
@@ -1263,7 +1254,7 @@ _get_pattern_ft_options (FcPattern *patt
FC_ANTIALIAS, 0, &antialias) != FcResultMatch)
antialias = FcTrue;
- if ((!bitmap && antialias) || transform)
+ if (!bitmap && antialias)
ft_options.load_flags |= FT_LOAD_NO_BITMAP;
else if (!antialias)
ft_options.load_flags |= FT_LOAD_MONOCHROME;
diff-tree f5bc26b75dd030ada70f87113e2d132dfcb0b0f3 (from da9cd55afbb55ae70991e3f5b4c0dc5b9a58e0d6)
Author: Jinghua Luo <sunmoon1997 at gmail.com>
Date: Sun Jun 11 18:09:05 2006 +0800
freetype: rework _transform_glyph_bitmap.
This function is used to shape bitmap glyphs(outline glyphs are
transformed by freetype). That means freetype backend is able to
tranform both bitmap & outline glyphs now. This is needed for glyph
rotating, artificial oblique etc.
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index d4a6e3e..398b894 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -96,6 +96,7 @@ struct _cairo_ft_unscaled_font {
double x_scale; /* Extracted X scale factor */
double y_scale; /* Extracted Y scale factor */
cairo_bool_t have_shape; /* true if the current scale has a non-scale component*/
+ cairo_matrix_t current_shape;
int lock; /* count of how many times this font has been locked */
@@ -629,6 +630,11 @@ _cairo_ft_unscaled_font_set_scale (cairo
mat.xy != 0x00000 ||
mat.yy != 0x10000);
+ cairo_matrix_init (&unscaled->current_shape,
+ sf.shape[0][0], sf.shape[0][1],
+ sf.shape[1][0], sf.shape[1][1],
+ 0.0, 0.0);
+
FT_Set_Transform(unscaled->face, &mat, NULL);
if ((unscaled->face->face_flags & FT_FACE_FLAG_SCALABLE) != 0) {
@@ -1082,18 +1088,17 @@ _render_glyph_bitmap (FT_Face fac
return status;
}
-#if 0
-/* XXX */
static cairo_status_t
-_transform_glyph_bitmap (cairo_image_glyph_cache_entry_t *val)
+_transform_glyph_bitmap (cairo_matrix_t * shape,
+ cairo_image_surface_t ** surface)
{
- cairo_ft_font_transform_t sf;
cairo_matrix_t original_to_transformed;
cairo_matrix_t transformed_to_original;
cairo_image_surface_t *old_image;
cairo_surface_t *image;
double x[4], y[4];
double origin_x, origin_y;
+ int origin_width, origin_height;
int i;
int x_min, y_min, x_max, y_max;
int width, height;
@@ -1101,26 +1106,26 @@ _transform_glyph_bitmap (cairo_image_gly
cairo_surface_pattern_t pattern;
/* We want to compute a transform that takes the origin
- * (val->size.x, val->size.y) to 0,0, then applies the "shape"
- * portion of the font transform
+ * (device_x_offset, device_y_offset) to 0,0, then applies
+ * the "shape" portion of the font transform
*/
- _compute_transform (&sf, &val->key.scale);
-
- cairo_matrix_init (&original_to_transformed,
- sf.shape[0][0], sf.shape[0][1],
- sf.shape[1][0], sf.shape[1][1],
- 0, 0);
+ original_to_transformed = *shape;
+
+ origin_x = (*surface)->base.device_x_offset;
+ origin_y = (*surface)->base.device_y_offset;
+ origin_width = cairo_image_surface_get_width (&(*surface)->base);
+ origin_height = cairo_image_surface_get_height (&(*surface)->base);
cairo_matrix_translate (&original_to_transformed,
- val->size.x, val->size.y);
+ origin_x, origin_y);
/* Find the bounding box of the original bitmap under that
* transform
*/
- x[0] = 0; y[0] = 0;
- x[1] = val->size.width; y[1] = 0;
- x[2] = val->size.width; y[2] = val->size.height;
- x[3] = 0; y[3] = val->size.height;
+ x[0] = 0; y[0] = 0;
+ x[1] = origin_width; y[1] = 0;
+ x[2] = origin_width; y[2] = origin_height;
+ x[3] = 0; y[3] = origin_height;
for (i = 0; i < 4; i++)
cairo_matrix_transform_point (&original_to_transformed,
@@ -1186,8 +1191,8 @@ _transform_glyph_bitmap (cairo_image_gly
/* Now update the cache entry for the new bitmap, recomputing
* the origin based on the final transform.
*/
- origin_x = - val->size.x;
- origin_y = - val->size.y;
+ origin_x = - origin_x;
+ origin_y = - origin_y;
cairo_matrix_transform_point (&original_to_transformed,
&origin_x, &origin_y);
@@ -1195,14 +1200,11 @@ _transform_glyph_bitmap (cairo_image_gly
(*surface) = (cairo_image_surface_t *)image;
cairo_surface_destroy (&old_image->base);
- val->size.width = width;
- val->size.height = height;
- val->size.x = - floor (origin_x + 0.5);
- val->size.y = - floor (origin_y + 0.5);
+ (*surface)->base.device_x_offset = - floor (origin_x + 0.5);
+ (*surface)->base.device_y_offset = - floor (origin_y + 0.5);
return status;
}
-#endif
static const cairo_unscaled_font_backend_t cairo_ft_unscaled_font_backend = {
_cairo_ft_unscaled_font_destroy,
@@ -1897,7 +1899,13 @@ _cairo_ft_scaled_glyph_init (void *abs
if (glyph->format == FT_GLYPH_FORMAT_OUTLINE)
status = _render_glyph_outline (face, &scaled_font->base.options,
&surface);
- else
+ else if (glyph->format == FT_GLYPH_FORMAT_BITMAP) {
+ status = _render_glyph_bitmap (face, &scaled_font->base.options,
+ &surface);
+ if (status == CAIRO_STATUS_SUCCESS && unscaled->have_shape)
+ status = _transform_glyph_bitmap (&unscaled->current_shape,
+ &surface);
+ } else
status = _render_glyph_bitmap (face, &scaled_font->base.options,
&surface);
if (status) {
More information about the cairo-commit
mailing list