[mapserver-commits] r12731 - trunk/mapserver

[svn at osgeo.org]

Author: rouault
Date: 2011-11-01 04:02:36 -0700 (Tue, 01 Nov 2011)
New Revision: 12731

Modified:
   trunk/mapserver/maprendering.c
Log:
Fix MSVC compilation

Modified: trunk/mapserver/maprendering.c
===================================================================
--- trunk/mapserver/maprendering.c	2011-10-31 23:24:15 UTC (rev 12730)
+++ trunk/mapserver/maprendering.c	2011-11-01 11:02:36 UTC (rev 12731)
@@ -281,13 +281,13 @@
    for(i=0; i<p->numlines; i++)
    {
       int line_in = 0;
+      double line_length=0;
       double current_length;
       if(initialgap < 0) {
          current_length = spacing/2.0; /* initial padding for each line */
       } else {
          current_length = initialgap; /* initial padding for each line */
       }
-      double line_length=0;
       for(j=1; j<p->line[i].numpoints; j++)
       {
          double rx,ry,theta,length;
@@ -775,14 +775,16 @@
 
          if(symbol->anchorpoint_x != 0.5 || symbol->anchorpoint_y != 0.5) {
             int sx,sy;
+            double ox, oy;
             msGetMarkerSize(symbolset, style, &sx, &sy, scalefactor);
-            double ox, oy;
             ox = (0.5 - symbol->anchorpoint_x) * sx;
             oy = (0.5 - symbol->anchorpoint_y) * sy;
             if(s.rotation != 0) {
                double sina,cosa;
                double rox,roy;
-               sincos(-s.rotation,&sina,&cosa);
+               /* sincos(-s.rotation,&sina,&cosa); */
+               sina = sin(-s.rotation);
+               cosa = cos(-s.rotation);
                rox = ox * cosa - oy * sina;
                roy = ox * sina + oy * cosa;
                p_x += rox;