[Plplot-cvs] SF.net SVN: plplot:[9774] trunk/drivers/cairo.c

[<ai...@us...>]

Revision: 9774
          http://plplot.svn.sourceforge.net/plplot/?rev=9774&view=rev
Author:   airwin
Date:     2009-03-26 01:52:28 +0000 (Thu, 26 Mar 2009)

Log Message:
-----------
Apparently in the old days libcairo implemented text clipping in an
inefficient way, but my tests of -dev pngcairo for a reasonably modern
version (1.6.4) of libcairo indicate only a 10 per cent slowdown if using
text_clipping=1.  Therefore, I have made text_clipping=1 the default so that
text will always get clipped correctly by cairo unless the user specifically
opts out with -drvopt text_clipping=0.

Modified Paths:
--------------
    trunk/drivers/cairo.c

Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c	2009-03-25 02:14:26 UTC (rev 9773)
+++ trunk/drivers/cairo.c	2009-03-26 01:52:28 UTC (rev 9774)
@@ -708,18 +708,19 @@
   aStream->cairoContext = NULL;
   aStream->downscale = downscale;
 
-  /* Set text clipping off as this makes the driver pretty slow */
-  aStream->text_clipping = 0;
-  text_clipping = 0;
+  /* Set text clipping on by default since it makes little difference in
+     speed for a modern cairo stack.*/
+  aStream->text_clipping = 1;
+  text_clipping = 1;
   text_anti_aliasing = 0;     // use 'default' text aliasing by default
   graphics_anti_aliasing = 0; // use 'default' graphics aliasing by default
 
   /* Check for cairo specific options */
   plParseDrvOpts(cairo_options);
 
-  /* Turn on text clipping if the user desires this */
-  if(text_clipping){
-    aStream->text_clipping = 1;
+  /* Turn off text clipping if the user desires this */
+  if(!text_clipping){
+    aStream->text_clipping = 0;
   }
 
   /* Record users desired text and graphics aliasing */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.