2008-01-16 Jim Evins <evins@snaught.com>

	* src/print.c: (print_label):
		Bug #1872568.  Don't apply special transforms (rotate and
		mirror) to clipping region or outline.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/branches/glabels-2_2@726 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog
index cb686da4b1a8da20e6594def5278a4d8c58b857c..dcdc094f3c6abb875c311d4865eea0021dc2ecbb 100644 (file)
--- a/glabels2/ChangeLog
+++ b/glabels2/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-16  Jim Evins  <evins@snaught.com>
+
+       * src/print.c: (print_label):
+               Bug #1872568.  Don't apply special transforms (rotate and
+               mirror) to clipping region or outline.
+
 2008-01-01  Jim Evins  <evins@snaught.com>
 
        * src/util.c:

diff --git a/glabels2/src/print.c b/glabels2/src/print.c
index b19c5c5b8fe570b22df047882e99553eecd5643c..a33e3ad1ab3b99b716b5170c0e15232bc9dd3d74 100644 (file)
--- a/glabels2/src/print.c
+++ b/glabels2/src/print.c
@@ -504,6 +504,12 @@ print_label (PrintInfo     *pi,
        /* Transform coordinate system to be relative to upper corner */
        /* of the current label */
        cairo_translate (pi->cr, x, y);
+
+       clip_to_outline (pi, label);
+
+       cairo_save (pi->cr);
+
+        /* Special transformations. */
        if (label->rotate_flag) {
                gl_debug (DEBUG_PRINT, "Rotate flag set");
                cairo_rotate (pi->cr, -M_PI/2.0);
@@ -514,13 +520,15 @@ print_label (PrintInfo     *pi,
                cairo_scale (pi->cr, -1.0, 1.0);
        }
 
-       clip_to_outline (pi, label);
         gl_label_draw (label, pi->cr, FALSE, record);
+
+       cairo_restore (pi->cr); /* From special transformations. */
+
        if (outline_flag) {
                draw_outline (pi, label);
        }
 
-       cairo_restore (pi->cr);
+       cairo_restore (pi->cr); /* From translation. */
 
        gl_debug (DEBUG_PRINT, "END");
 }