[cairo-commit] 2 commits - src/cairo-gstate.c src/cairo-pdf-surface.c

Behdad Esfahbod behdad at kemper.freedesktop.org
Sat Sep 15 01:03:15 PDT 2007


 src/cairo-gstate.c      |    9 +++++----
 src/cairo-pdf-surface.c |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
diff-tree 1274147ce3ec855488fe4e437838b1134c494413 (from 6fbe2432c6072522b9003a1e46180392010a7aad)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Sep 15 04:03:08 2007 -0400

    [cairo-gstate] Fix comment about font_matrix having zero translation

diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c
index 3eb206a..232b040 100644
--- a/src/cairo-gstate.c
+++ b/src/cairo-gstate.c
@@ -1397,13 +1397,14 @@ _cairo_gstate_get_scaled_font (cairo_gst
  *
  *   [ 12.0, 0.0, 0.0, 12.0, 0.0, 0.0 ]
  *
- * It is an affine matrix, like all cairo matrices, but its tx and ty
- * components are always set to zero; we don't permit "nudging" fonts
- * around.
+ * It is an affine matrix, like all cairo matrices, where its tx and ty
+ * components are used to "nudging" fonts around and are handled in gstate
+ * and then ignored by the "scaled-font" layer.
  *
  * In order to perform any action on a font, we must build an object
  * called a cairo_font_scale_t; this contains the central 2x2 matrix
- * resulting from "font matrix * CTM".
+ * resulting from "font matrix * CTM" (sans the font matrix translation
+ * components as stated in the previous paragraph).
  *
  * We pass this to the font when making requests of it, which causes it to
  * reply for a particular [user request, device] combination, under the CTM
diff-tree 6fbe2432c6072522b9003a1e46180392010a7aad (from dca93eb76d64194f1325d7b941fa523da7801634)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Sat Sep 15 04:02:39 2007 -0400

    [PDF] Fix typo in comments

diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index f9c7224..d43cdb0 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -1543,7 +1543,7 @@ _cairo_pdf_surface_emit_surface_pattern 
      * pattern space, (which has a size that we establish in the BBox
      * dictionary entry), to the PDF page's *initial* space, (which
      * does not benefit from the Y-axis flipping matrix that we emit
-     * on each page). So the PDF patterns patrix maps from a
+     * on each page). So the PDF patterns matrix maps from a
      * (width,height) pattern space to a device space with the origin
      * in the lower-left corner.
      *


More information about the cairo-commit mailing list