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

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

Revision: 10352
          http://plplot.svn.sourceforge.net/plplot/?rev=10352&view=rev
Author:   airwin
Date:     2009-08-27 16:38:57 +0000 (Thu, 27 Aug 2009)

Log Message:
-----------
Remove unused variables as noted by gcc -Wall option.  Thanks to Mark de Wever
for this patch.

Modified Paths:
--------------
    trunk/drivers/cairo.c
    trunk/examples/c/x03c.c
    trunk/examples/c/x32c.c
    trunk/examples/c++/x03.cc
    trunk/examples/c++/x16.cc
    trunk/src/plarc.c
    trunk/src/plargs.c
    trunk/src/plbuf.c

Modified: trunk/drivers/cairo.c
===================================================================
--- trunk/drivers/cairo.c	2009-08-27 03:41:19 UTC (rev 10351)
+++ trunk/drivers/cairo.c	2009-08-27 16:38:57 UTC (rev 10352)
@@ -598,13 +598,11 @@
 void text_end_cairo(PLStream *pls, EscText *args)
 {
   int textXExtent, textYExtent;
-  char *textWithPangoMarkup;
-  PLFLT rotation, shear, stride, cos_rot, sin_rot, cos_shear, sin_shear, diorot_rad;
+  PLFLT rotation, shear, stride, cos_rot, sin_rot, cos_shear, sin_shear;
   cairo_matrix_t *cairoTransformMatrix;
   cairo_font_options_t *cairoFontOptions;
   PangoContext *context;
   PangoLayout *layout;
-  PangoFontDescription *fontDescription;
   PLCairo *aStream;
 
   aStream = (PLCairo *)pls->dev;
@@ -686,7 +684,6 @@
 
 void proc_str(PLStream *pls, EscText *args)
 {
-  int i;
   float fontSize;
   int textXExtent, textYExtent;
   char *textWithPangoMarkup;
@@ -695,7 +692,6 @@
   cairo_font_options_t *cairoFontOptions;
   PangoContext *context;
   PangoLayout *layout;
-  PangoFontDescription *fontDescription;
   PLCairo *aStream;
 
   aStream = (PLCairo *)pls->dev;
@@ -897,7 +893,6 @@
 
 void open_span_tag(char *pangoMarkupString, PLUNICODE fci, float fontSize, int upDown)
 {
-  int i;
   unsigned char fontFamily, fontStyle, fontWeight;
   char openTag[TAG_LEN];
 
@@ -1432,7 +1427,6 @@
 void plD_init_xcairo(PLStream *pls)
 {
   char plotTitle[40];
-  XGCValues values;
   PLCairo *aStream;
 
   /* Setup the PLStream and the font lookup table. */

Modified: trunk/examples/c/x03c.c
===================================================================
--- trunk/examples/c/x03c.c	2009-08-27 03:41:19 UTC (rev 10351)
+++ trunk/examples/c/x03c.c	2009-08-27 16:38:57 UTC (rev 10352)
@@ -14,7 +14,7 @@
 int
 main(int argc, const char *argv[])
 {
-    int i, j;
+    int i;
     PLFLT dtr, theta, dx, dy, r, offset;
     char text[4];
     static PLFLT x0[361], y0[361];

Modified: trunk/examples/c/x32c.c
===================================================================
--- trunk/examples/c/x32c.c	2009-08-27 03:41:19 UTC (rev 10351)
+++ trunk/examples/c/x32c.c	2009-08-27 16:38:57 UTC (rev 10352)
@@ -61,12 +61,12 @@
     /* outliers */
     static PLFLT outx[] = { 3.5, 6.5 };
     static PLFLT outy[] = { 0.89, 1.09 };
-
+/*
     static PLFLT pos[] = {0.0, 0.25, 0.5, 0.75, 1.0};
     static PLFLT red[] = {0.0, 0.25, 0.5, 1.0, 1.0};
     static PLFLT green[] = {1.0, 0.5, 0.5, 0.5, 1.0};
     static PLFLT blue[] = {1.0, 1.0, 0.5, 0.25, 0.0};
-
+*/
 /* Parse and process command line arguments */
 
     (void) plparseopts(&argc, argv, PL_PARSE_FULL);

Modified: trunk/examples/c++/x03.cc
===================================================================
--- trunk/examples/c++/x03.cc	2009-08-27 03:41:19 UTC (rev 10351)
+++ trunk/examples/c++/x03.cc	2009-08-27 16:38:57 UTC (rev 10352)
@@ -47,7 +47,7 @@
 
 x03::x03( int argc, const char ** argv ) {
 
-  int i, j;
+  int i;
   char text[4];
   PLFLT dtr, theta, dx, dy, r, offset;
 

Modified: trunk/examples/c++/x16.cc
===================================================================
--- trunk/examples/c++/x16.cc	2009-08-27 03:41:19 UTC (rev 10351)
+++ trunk/examples/c++/x16.cc	2009-08-27 16:38:57 UTC (rev 10352)
@@ -48,10 +48,6 @@
   static int ny;
   static int exclude;
   const static int PERIMETERPTS;
-
-  // calculated constants and array that depends on them
-  PLFLT xspa;
-  PLFLT ypsa;
 public:
   static PLFLT tr[];
 
@@ -173,11 +169,6 @@
   pls->Alloc2dGrid(&z,nx,ny);
   pls->Alloc2dGrid(&w,nx,ny);
 
-  // calculated constants and array that depends on them
-  PLFLT xspa =  2./(nx-1);
-  PLFLT yspa =  2./(ny-1);
-
-
   // Set up data array
 
   for (i = 0; i < nx; i++) {

Modified: trunk/src/plarc.c
===================================================================
--- trunk/src/plarc.c	2009-08-27 03:41:19 UTC (rev 10351)
+++ trunk/src/plarc.c	2009-08-27 16:38:57 UTC (rev 10352)
@@ -105,7 +105,6 @@
 {
     PLINT xscl[2], yscl[2];
     PLINT clpxmi, clpxma, clpymi, clpyma;
-    PLFLT orientation_offset, orientation;
     arc_struct *arc_info;
 
     /* TODO: For now, only unrotated plots use the driver-accelerated path. */

Modified: trunk/src/plargs.c
===================================================================
--- trunk/src/plargs.c	2009-08-27 03:41:19 UTC (rev 10351)
+++ trunk/src/plargs.c	2009-08-27 16:38:57 UTC (rev 10352)
@@ -1606,7 +1606,7 @@
 {
     const char *rgb;
     char *color_field, *alpha_field;
-    long bgcolor, r, g, b, length;
+    long bgcolor, r, g, b;
     PLFLT a;
 
 /* Strip off leading "#" (TK-ism) if present. */

Modified: trunk/src/plbuf.c
===================================================================
--- trunk/src/plbuf.c	2009-08-27 03:41:19 UTC (rev 10351)
+++ trunk/src/plbuf.c	2009-08-27 16:38:57 UTC (rev 10352)
@@ -850,7 +850,6 @@
   PLUNICODE(fci);
   EscText text;
   PLFLT xform[4];
-  PLUNICODE* unicode;
 
   text.xform = xform;
 


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