summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Michael Moore <cmoore@src.gnome.org>2004-06-13 17:53:08 +0000
committerCaleb Michael Moore <cmoore@src.gnome.org>2004-06-13 17:53:08 +0000
commit5d9a6230d2b5a65d5484566031b6ad122d8a0435 (patch)
tree52f66cf070161915a0d2f6df11e86e78dea6c7d1
parent31126ae9ab32f72013ff2e70fd2595a27fc4326b (diff)
downloadlibrsvg-5d9a6230d2b5a65d5484566031b6ad122d8a0435.tar.gz
you know what this is. Everyone knows what this is. It is fucking cool, that's what this is!
-rw-r--r--rsvg-filter.c4
-rw-r--r--rsvg-text-vectors.c11
2 files changed, 10 insertions, 5 deletions
diff --git a/rsvg-filter.c b/rsvg-filter.c
index 99f38ffc..c78c9ad4 100644
--- a/rsvg-filter.c
+++ b/rsvg-filter.c
@@ -3038,8 +3038,8 @@ rsvg_filter_primitive_composite_render (RsvgFilterPrimitive * self,
for (i = 0; i < 3; i++)
{
- ca = (double) in_pixels[4 * x + y * rowstride + i] / 255.0;
- cb = (double) in2_pixels[4 * x + y * rowstride + i] / 255.0;
+ ca = (double) in_pixels[4 * x + y * rowstride + i] / 255.0 * qa;
+ cb = (double) in2_pixels[4 * x + y * rowstride + i] / 255.0 * qb;
cr = (ca * bself->k2 + cb * bself->k3 +
ca * cb * bself->k1 + bself->k4);
diff --git a/rsvg-text-vectors.c b/rsvg-text-vectors.c
index 1d5f13fc..665fb61b 100644
--- a/rsvg-text-vectors.c
+++ b/rsvg-text-vectors.c
@@ -219,6 +219,8 @@ rsvg_text_layout_render_flags (RsvgTextLayout *layout)
if (AUTO_HINT_TEXT)
flags |= FT_LOAD_FORCE_AUTOHINT;
+ flags |= FT_LOAD_NO_SCALE ;
+
return flags;
}
@@ -228,8 +230,8 @@ rsvg_text_vector_coords (RenderCtx *ctx,
gdouble *x,
gdouble *y)
{
- *x = ctx->offset_x + (gdouble)vector->x /* / 64. */;
- *y = ctx->offset_y - (gdouble)vector->y /* / 64. */;
+ *x = ctx->offset_x + (long)vector->x / 64;
+ *y = ctx->offset_y - (long)vector->y / 64;
}
static void
@@ -469,7 +471,7 @@ rsvg_text_render_vectors (PangoFont *font,
context->offset_x = (gdouble) x / PANGO_SCALE;
context->offset_y = (gdouble) y / PANGO_SCALE;
-
+
FT_Outline_Decompose (&outline_glyph->outline, &outline_funcs, context);
}
@@ -550,6 +552,9 @@ rsvg_text_render_text (RsvgHandle *ctx,
RsvgTextLayout *layout;
RenderCtx *render;
+ state->fill_rule = FILL_RULE_EVENODD;
+ state->has_fill_rule = TRUE;
+
layout = rsvg_text_layout_new (ctx, state, text);
render = rsvg_render_ctx_new ();