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

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

Revision: 9718
          http://plplot.svn.sourceforge.net/plplot/?rev=9718&view=rev
Author:   smekal
Date:     2009-03-11 15:29:54 +0000 (Wed, 11 Mar 2009)

Log Message:
-----------
To get rid of Visual C++ warnings, unreferenced variables were removed, explicit type casts added and Debug2 (two arguments) and Debug3 (3 arguments) macros were added.

Modified Paths:
--------------
    trunk/drivers/wingcc.c
    trunk/drivers/xfig.c

Modified: trunk/drivers/wingcc.c
===================================================================
--- trunk/drivers/wingcc.c	2009-03-11 14:39:48 UTC (rev 9717)
+++ trunk/drivers/wingcc.c	2009-03-11 15:29:54 UTC (rev 9718)
@@ -161,6 +161,8 @@
 
 #if defined(_MSC_VER)
   #define Debug(a) do {if (pls->debug){fprintf(stderr,(a));}}while(0)
+  #define Debug2(a,b) do {if (pls->debug){fprintf(stderr,(a),(b));}}while(0)
+  #define Debug3(a,b,c) do {if (pls->debug){fprintf(stderr,(a),(b),(c));}}while(0)
 #elif defined(__BORLANDC__)
   #define Debug if (pls->debug) printf
 #else
@@ -623,10 +625,10 @@
         dev->scale=(PLFLT)PIXELS_Y/dev->height;
       }
 
-     Debug("Scale = %f (FLT)\n",dev->scale);
+     Debug2("Scale = %f (FLT)\n",dev->scale);
 
      plP_setpxl(dev->scale*pls->xdpi/25.4,dev->scale*pls->ydpi/25.4);
-     plP_setphy(0, dev->scale*dev->width, 0, dev->scale*dev->height);
+     plP_setphy(0, (PLINT)(dev->scale*dev->width), 0, (PLINT)(dev->scale*dev->height));
 
 #ifdef HAVE_FREETYPE
 if (pls->dev_text)
@@ -650,10 +652,10 @@
   POINT points[2];
 
 
-  points[0].x=x1a/dev->scale;
-  points[1].x=x2a/dev->scale;
-  points[0].y=dev->height - (y1a/dev->scale);
-  points[1].y=dev->height - (y2a/dev->scale);
+  points[0].x=(LONG)(x1a/dev->scale);
+  points[1].x=(LONG)(x2a/dev->scale);
+  points[0].y=(LONG)(dev->height - (y1a/dev->scale));
+  points[1].y=(LONG)(dev->height - (y2a/dev->scale));
 
   dev->oldobject = SelectObject (dev->hdc, dev->pen);
 
@@ -687,8 +689,8 @@
         {
           for (i = 0; i < npts; i++)
             {
-              points[i].x =  (unsigned long) xa[i]/dev->scale;
-              points[i].y =  (unsigned long) dev->height - (ya[i]/dev->scale);
+              points[i].x = (LONG)(xa[i]/dev->scale);
+              points[i].y = (LONG)(dev->height - (ya[i]/dev->scale));
             }
           dev->oldobject = SelectObject (dev->hdc, dev->pen);
           Polyline(dev->hdc,points,npts);
@@ -726,8 +728,8 @@
 
       for (i = 0; i < pls->dev_npts; i++)
         {
-          points[i].x = pls->dev_x[i]/dev->scale;
-          points[i].y = dev->height -(pls->dev_y[i]/dev->scale);
+          points[i].x = (PLINT)(pls->dev_x[i]/dev->scale);
+          points[i].y = (PLINT)(dev->height -(pls->dev_y[i]/dev->scale));
         }
 
       dev->fillbrush = CreateSolidBrush(dev->colour);
@@ -999,7 +1001,7 @@
   	{
   	   memcpy(&dev->oldrect,&dev->rect,sizeof(RECT));
       GetClientRect(dev->hwnd,&dev->rect);
-      Debug("[%d %d]",dev->rect.right,dev->rect.bottom);
+      Debug3("[%d %d]",dev->rect.right,dev->rect.bottom);
 
    	if ((dev->rect.right>0)&&(dev->rect.bottom>0))    /* Check to make sure it isn't just minimised (i.e. zero size) */
         {
@@ -1322,8 +1324,7 @@
   pls->xdpi=GetDeviceCaps(dev->hdc,HORZRES)/GetDeviceCaps(dev->hdc,HORZSIZE)*25.4;
   pls->ydpi=GetDeviceCaps(dev->hdc,VERTRES)/GetDeviceCaps(dev->hdc,VERTSIZE)*25.4;
   plP_setpxl(dev->scale*pls->xdpi/25.4,dev->scale*pls->ydpi/25.4);
-  plP_setphy(0, dev->scale*dev->width, 0, dev->scale*dev->height);
-
+  plP_setphy(0, (PLINT)(dev->scale*dev->width), 0, (PLINT)(dev->scale*dev->height));
 }
 
 /*--------------------------------------------------------------------------*\
@@ -1342,8 +1343,6 @@
   #endif
   PRINTDLG  Printer;
   DOCINFO docinfo;
-  char *PrinterName;
-  BOOL ret;
 
   /*
    *    Reset the docinfo structure to 0 and set it's fields up

Modified: trunk/drivers/xfig.c
===================================================================
--- trunk/drivers/xfig.c	2009-03-11 14:39:48 UTC (rev 9717)
+++ trunk/drivers/xfig.c	2009-03-11 15:29:54 UTC (rev 9718)
@@ -141,7 +141,7 @@
       pls->color = 1;         /* Is a color device */
 
     plP_setpxl(dev->xscale_dev, dev->xscale_dev); /* dpmm -- dots per mm */
-    plP_setphy(0, FIGX * dev->xscale_dev, 0, FIGY * dev->yscale_dev); /* physical dimension in mm */ 
+    plP_setphy(0, (PLINT)(FIGX * dev->xscale_dev), 0, (PLINT)(FIGY * dev->yscale_dev)); /* physical dimension in mm */ 
 
 /* Write out header */
 
@@ -541,8 +541,8 @@
     ref = DPI/72. * ft_ht / 2.;
 
   /* rotate point in xfig is lower left corner, compensate */
-  args->y = dev->offset + dev->ymax * (int)dev->xscale_dev - (args->y - ref*cos(alpha));
-  args->x = args->x + ref*sin(alpha);
+  args->y = (PLINT)(dev->offset + dev->ymax * (int)dev->xscale_dev - (args->y - ref*cos(alpha)));
+  args->x = (PLINT)(args->x + ref*sin(alpha));
 
   /*
    *  font family, serie and shape. Currently not supported by plplot


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