[mapserver-commits] r7774 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2008-07-02 20:50:36 -0400 (Wed, 02 Jul 2008)
New Revision: 7774

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapdraw.c
   trunk/mapserver/mapgd.c
   trunk/mapserver/mapserver.h
Log:
Updated versions...

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-07-02 21:23:48 UTC (rev 7773)
+++ trunk/mapserver/HISTORY.TXT	2008-07-03 00:50:36 UTC (rev 7774)
@@ -9,8 +9,8 @@
 
 For a complete change history, please see the Subversion log comments.
 
-Current Version (SVN trunk):
-----------------------------
+Version 5.2.0-beta3 (2008-07-02):
+---------------------------------
 
 - Added support in configure script for pkg-config for fribidi2 (#2664)
 

Modified: trunk/mapserver/mapdraw.c
===================================================================
--- trunk/mapserver/mapdraw.c	2008-07-02 21:23:48 UTC (rev 7773)
+++ trunk/mapserver/mapdraw.c	2008-07-03 00:50:36 UTC (rev 7774)
@@ -1332,6 +1332,8 @@
   cliprect.maxx = map->extent.maxx + csz*map->cellsize;
   cliprect.maxy = map->extent.maxy + csz*map->cellsize;
 
+  printf("%f %f %f %f\n", cliprect.minx, cliprect.miny, cliprect.maxx, cliprect.maxy);
+
   if(msBindLayerToShape(layer, shape) != MS_SUCCESS)
     return MS_FAILURE; /* error message is set in msBindLayerToShape() */
   
@@ -1584,6 +1586,8 @@
       return(MS_FAILURE);
     }
 
+    printf("Here!\n");
+
 #ifdef USE_PROJ
     if(layer->project && msProjectionsDiffer(&(layer->projection), &(map->projection)))
       msProjectShape(&layer->projection, &map->projection, shape);
@@ -1613,9 +1617,11 @@
 
 
     if(layer->transform == MS_TRUE) {
+      printf("Transform!\n");
       msClipPolylineRect(shape, cliprect);
       if(shape->numlines == 0) return(MS_SUCCESS);
       msTransformShape(shape, map->extent, map->cellsize, image);
+      printf("%g,%g %g,%g\n", shape->line[0].point[0].x, shape->line[0].point[0].y, shape->line[0].point[1].x, shape->line[0].point[1].y);
     } else
       msOffsetShapeRelativeTo(shape, layer);
  

Modified: trunk/mapserver/mapgd.c
===================================================================
--- trunk/mapserver/mapgd.c	2008-07-02 21:23:48 UTC (rev 7773)
+++ trunk/mapserver/mapgd.c	2008-07-03 00:50:36 UTC (rev 7774)
@@ -860,8 +860,10 @@
     imageOffsetPolyline(img, p, color, offsetx, offsety);
   else {
     for (i = 0; i < p->numlines; i++)
-      for(j=1; j<p->line[i].numpoints; j++)
+      for(j=1; j<p->line[i].numpoints; j++) {
+        printf("IP: %d,%d %d,%d\n", (int)p->line[i].point[j-1].x, (int)p->line[i].point[j-1].y, (int)p->line[i].point[j].x, (int)p->line[i].point[j].y);
         gdImageLine(img, (int)p->line[i].point[j-1].x, (int)p->line[i].point[j-1].y, (int)p->line[i].point[j].x, (int)p->line[i].point[j].y, color);
+      }
   }
 }
 

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2008-07-02 21:23:48 UTC (rev 7773)
+++ trunk/mapserver/mapserver.h	2008-07-03 00:50:36 UTC (rev 7774)
@@ -119,7 +119,7 @@
 
 /* General defines, wrapable */
 
-#define MS_VERSION "5.2.0-beta3"
+#define MS_VERSION "5.2.0-beta4"
 
 #define MS_TRUE 1 /* logical control variables */
 #define MS_FALSE 0