[Plplot-cvs] SF.net SVN: plplot:[9728] trunk/drivers

[<sm...@us...>]

Revision: 9728
          http://plplot.svn.sourceforge.net/plplot/?rev=9728&view=rev
Author:   smekal
Date:     2009-03-12 08:19:17 +0000 (Thu, 12 Mar 2009)

Log Message:
-----------
To get rid of Visual C++ warnings explicit type casts were added.

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

Modified: trunk/drivers/cgm.c
===================================================================
--- trunk/drivers/cgm.c	2009-03-12 08:18:31 UTC (rev 9727)
+++ trunk/drivers/cgm.c	2009-03-12 08:19:17 UTC (rev 9728)
@@ -185,7 +185,6 @@
 plD_init_cgm_Dev(PLStream *pls)
 {
     cgm_Dev *dev;
-    int i;
     
 /* Allocate and initialize device-specific data */
 
@@ -208,8 +207,6 @@
     dev->fill_colour=dev->colour; /* initially set fill and line colour the same */
     dev->last_fill_colour=-1;  /* set to -1 = unallocated */
     dev->last_line_colour=-1;  /* set to -1 = unallocated */
-
-
 }
 
 /*----------------------------------------------------------------------*\

Modified: trunk/drivers/ps.c
===================================================================
--- trunk/drivers/ps.c	2009-03-12 08:18:31 UTC (rev 9727)
+++ trunk/drivers/ps.c	2009-03-12 08:19:17 UTC (rev 9728)
@@ -735,7 +735,7 @@
   #define PROC_STR_STRING_LENGTH 1000
   unsigned char *strp, str[PROC_STR_STRING_LENGTH], *cur_strp, 
      cur_str[PROC_STR_STRING_LENGTH];
-  float font_factor = 1.4;
+  float font_factor = 1.4f;
   PLINT clxmin, clxmax, clymin, clymax; /* Clip limits */
   PLINT clipx[4],clipy[4]; /* Current clip limits */
 
@@ -852,8 +852,8 @@
 	
 	/* Determine the adjustment for page orientation */
 	theta -= 90.*pls->diorot;
-	args->y += offset*cos(theta*PI/180.);
-	args->x -= offset*sin(theta*PI/180.);
+	args->y += (PLINT)(offset*cos(theta*PI/180.));
+	args->x -= (PLINT)(offset*sin(theta*PI/180.));
 		
 	/* ps driver is rotated by default */
 	plRotPhy(ORIENTATION, dev->xmin, dev->ymin, dev->xmax, dev->ymax, 
@@ -1019,10 +1019,10 @@
 	l1 *= 0.6;
 	l2 *= 0.6;
 	
-	dev->llx = MIN(dev->llx, args->x + (MIN(l1*cs,l2*cs)-1.5) * font_factor * ft_ht * ENLARGE );
-	dev->lly = MIN(dev->lly, args->y + (MIN(l1*sn,l2*sn)-1.5) * font_factor * ft_ht * ENLARGE );
-	dev->urx = MAX(dev->urx, args->x + (MAX(l1*cs,l2*cs)+1.5) * font_factor * ft_ht * ENLARGE );
-	dev->ury = MAX(dev->ury, args->y + (MAX(l1*sn,l2*sn)+1.5) * font_factor * ft_ht * ENLARGE );
+	dev->llx = (int)(MIN(dev->llx, args->x + (MIN(l1*cs,l2*cs)-1.5) * font_factor * ft_ht * ENLARGE));
+	dev->lly = (int)(MIN(dev->lly, args->y + (MIN(l1*sn,l2*sn)-1.5) * font_factor * ft_ht * ENLARGE));
+	dev->urx = (int)(MAX(dev->urx, args->x + (MAX(l1*cs,l2*cs)+1.5) * font_factor * ft_ht * ENLARGE));
+	dev->ury = (int)(MAX(dev->ury, args->y + (MAX(l1*sn,l2*sn)+1.5) * font_factor * ft_ht * ENLARGE));
 
      }
 }

Modified: trunk/drivers/svg.c
===================================================================
--- trunk/drivers/svg.c	2009-03-12 08:18:31 UTC (rev 9727)
+++ trunk/drivers/svg.c	2009-03-12 08:19:17 UTC (rev 9728)
@@ -962,7 +962,7 @@
 short desired_offset(short level, double ftHt)
 {
   if(level != 0){
-    return -level * ftHt * pow(0.6, abs(level));
+    return (short)(-level * ftHt * pow(0.6, abs(level)));
   }
   else{
     return 0;


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