[mapserver-commits] r11432 - trunk/mapserver/renderers/agg/src

[svn at osgeo.org]

Author: tbonfort
Date: 2011-03-31 07:44:16 -0700 (Thu, 31 Mar 2011)
New Revision: 11432

Modified:
   trunk/mapserver/renderers/agg/src/agg_curves.cpp
   trunk/mapserver/renderers/agg/src/agg_svg_parser.cpp
   trunk/mapserver/renderers/agg/src/agg_svg_path_tokenizer.cpp
   trunk/mapserver/renderers/agg/src/clipper.cpp
Log:
fix compiler warnings in agg building


Modified: trunk/mapserver/renderers/agg/src/agg_curves.cpp
===================================================================
--- trunk/mapserver/renderers/agg/src/agg_curves.cpp	2011-03-31 14:23:53 UTC (rev 11431)
+++ trunk/mapserver/renderers/agg/src/agg_curves.cpp	2011-03-31 14:44:16 UTC (rev 11432)
@@ -252,9 +252,10 @@
         return m_scale;
     }
 
+#if defined(_MSC_VER) && _MSC_VER <= 1200
     //------------------------------------------------------------------------
     static double MSC60_fix_ICE(double v) { return v; }
-
+#endif
     //------------------------------------------------------------------------
     void curve4_inc::init(double x1, double y1, 
                           double x2, double y2, 

Modified: trunk/mapserver/renderers/agg/src/agg_svg_parser.cpp
===================================================================
--- trunk/mapserver/renderers/agg/src/agg_svg_parser.cpp	2011-03-31 14:23:53 UTC (rev 11431)
+++ trunk/mapserver/renderers/agg/src/agg_svg_parser.cpp	2011-03-31 14:44:16 UTC (rev 11432)
@@ -243,7 +243,7 @@
                 sprintf(msg,
                     "%s at line %d\n",
                     XML_ErrorString(XML_GetErrorCode(p)),
-                    XML_GetCurrentLineNumber(p));
+                    (int)XML_GetCurrentLineNumber(p));
                 throw exception(msg);
             }
         }

Modified: trunk/mapserver/renderers/agg/src/agg_svg_path_tokenizer.cpp
===================================================================
--- trunk/mapserver/renderers/agg/src/agg_svg_path_tokenizer.cpp	2011-03-31 14:23:53 UTC (rev 11431)
+++ trunk/mapserver/renderers/agg/src/agg_svg_path_tokenizer.cpp	2011-03-31 14:44:16 UTC (rev 11432)
@@ -35,7 +35,7 @@
 
     //------------------------------------------------------------------------
     path_tokenizer::path_tokenizer()
-        : m_path(0), m_last_command(0), m_last_number(0.0)
+        : m_path(0), m_last_number(0.0), m_last_command(0)
     {
         init_char_mask(m_commands_mask,   s_commands);
         init_char_mask(m_numeric_mask,    s_numeric);
@@ -120,7 +120,7 @@
         char* buf_ptr = buf;
 
         // Copy all sign characters
-        while(buf_ptr < buf+255 && *m_path == '-' || *m_path == '+')
+        while((buf_ptr < buf+255 && *m_path == '-') || *m_path == '+')
         {
             *buf_ptr++ = *m_path++;
         }

Modified: trunk/mapserver/renderers/agg/src/clipper.cpp
===================================================================
--- trunk/mapserver/renderers/agg/src/clipper.cpp	2011-03-31 14:23:53 UTC (rev 11431)
+++ trunk/mapserver/renderers/agg/src/clipper.cpp	2011-03-31 14:44:16 UTC (rev 11432)
@@ -1450,7 +1450,6 @@
 bool Clipper::Execute(TClipType clipType, TPolyPolygon &polypoly)
 {
 	double ybot; double ytop;
-	int i;
 
 	polypoly.resize(0);
 	if(  m_ExecuteLocked || !InitializeScanbeam() ) return false;