[Plplot-cvs] SF.net SVN: plplot:[8975] trunk/drivers/svg.c

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

Revision: 8975
          http://plplot.svn.sourceforge.net/plplot/?rev=8975&view=rev
Author:   airwin
Date:     2008-10-26 19:58:50 +0000 (Sun, 26 Oct 2008)

Log Message:
-----------
Follow pattern used in gd.c to free structure alloced to hold device-dependent
data.

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

Modified: trunk/drivers/svg.c
===================================================================
--- trunk/drivers/svg.c	2008-10-26 18:42:51 UTC (rev 8974)
+++ trunk/drivers/svg.c	2008-10-26 19:58:50 UTC (rev 8975)
@@ -170,8 +170,21 @@
   if (!pls->colorset)
     pls->color = 1; 
 
-  /* Set up device parameters */ 
-  aStream = malloc(sizeof(SVG));
+  /* Initialize family file info */
+  plFamInit(pls);
+
+  /* Prompt for a file name if not already set */    
+  plOpenFile(pls);
+/* Allocate and initialize device-specific data */
+
+  if (pls->dev != NULL)
+    free((void *) pls->dev);
+
+  pls->dev = calloc(1, (size_t) sizeof(SVG));
+  if (pls->dev == NULL)
+    plexit("plD_init_svg: Out of memory.");
+
+  aStream = (SVG *) pls->dev;
   
   /* Set the bounds for plotting.  default is SVG_Default_X x SVG_Default_Y unless otherwise specified. */
    
@@ -196,11 +209,6 @@
 
   plP_setpxl(aStream->scale*DPI/25.4, aStream->scale*DPI/25.4);           /* Pixels/mm. */
 
-  /* Initialize family file info */
-  plFamInit(pls);
-
-  /* Prompt for a file name if not already set */    
-  plOpenFile(pls);
   aStream->svgFile = pls->OutFile;
 
   /* Handle the text clipping option */
@@ -211,7 +219,6 @@
     aStream->textClipping = 1;
   }
   aStream->textClipping = text_clipping;
-  pls->dev = aStream;
 
   aStream->svgIndent = 0;
   svg_general(aStream, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
@@ -231,7 +238,7 @@
 
   /* Plot familying stuff. Not really understood, just copying gd.c */
   plGetFam(pls);
-/* n.b. pls->dev can change because of an indirect call to plD_init_png
+/* n.b. pls->dev can change because of an indirect call to plD_init_svg
  * from plGetFam if familying is enabled.  Thus, wait to define aStream until
  * now. */
   aStream = pls->dev;


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