[Plplot-cvs] SF.net SVN: plplot:[10591] trunk

[<hba...@us...>]

Revision: 10591
          http://plplot.svn.sourceforge.net/plplot/?rev=10591&view=rev
Author:   hbabcock
Date:     2009-11-15 02:17:14 +0000 (Sun, 15 Nov 2009)

Log Message:
-----------
In order for -save to work plP_text must use both text rendering paths. To avoid having the text rendered twice the cairo driver checks to see which rendering path is active before rendering the text.

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

Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c	2009-11-15 01:30:26 UTC (rev 10590)
+++ trunk/drivers/cairo.c	2009-11-15 02:17:14 UTC (rev 10591)
@@ -479,7 +479,9 @@
         filled_polygon( pls, pls->dev_x, pls->dev_y, pls->dev_npts );
         break;
     case PLESC_HAS_TEXT:
-        proc_str( pls, (EscText *) ptr );
+        if(!pls->alt_unicode){
+            proc_str( pls, (EscText *) ptr );
+        }
         break;
     case PLESC_BEGIN_TEXT: /* get ready to get a handle a string of text */
         text_begin_cairo( pls, (EscText *) ptr );

Modified: trunk/src/plcore.c
===================================================================
--- trunk/src/plcore.c	2009-11-15 01:30:26 UTC (rev 10590)
+++ trunk/src/plcore.c	2009-11-15 02:17:14 UTC (rev 10591)
@@ -946,10 +946,10 @@
             args.string = string;
         }
 
-        if ( !plsc->alt_unicode )
-        {
+	//        if ( !plsc->alt_unicode )
+	//        {
             plP_esc( PLESC_HAS_TEXT, &args );
-        }
+	    //        }
 #ifndef DEBUG_TEXT
     }
     else


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