[mapserver-commits] r10029 - branches/branch-5-6/mapserver

[svn at osgeo.org]

Author: warmerdam
Date: 2010-03-29 17:32:02 -0400 (Mon, 29 Mar 2010)
New Revision: 10029

Modified:
   branches/branch-5-6/mapserver/HISTORY.TXT
   branches/branch-5-6/mapserver/maptemplate.c
Log:
avoid adjusting map->extent in checkWebScale() (#3413)

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-03-29 21:26:59 UTC (rev 10028)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-03-29 21:32:02 UTC (rev 10029)
@@ -14,6 +14,8 @@
 
 Version 5.6.4 (????-??-??):
 ---------------------------
+ 
+- Fix MS_NONSQUARE to work in mode=map (#3413)
 
 - Improve error message when loadQuery() filename extension check fails (#3302)
 

Modified: branches/branch-5-6/mapserver/maptemplate.c
===================================================================
--- branches/branch-5-6/mapserver/maptemplate.c	2010-03-29 21:26:59 UTC (rev 10028)
+++ branches/branch-5-6/mapserver/maptemplate.c	2010-03-29 21:32:02 UTC (rev 10029)
@@ -145,9 +145,10 @@
 int checkWebScale(mapservObj *mapserv) 
 {
   int status;
+  rectObj work_extent = mapserv->map->extent;
 
-  mapserv->map->cellsize = msAdjustExtent(&(mapserv->map->extent), mapserv->map->width, mapserv->map->height); /* we do this cause we need a scale */
-  if((status = msCalculateScale(mapserv->map->extent, mapserv->map->units, mapserv->map->width, mapserv->map->height, mapserv->map->resolution, &mapserv->map->scaledenom)) != MS_SUCCESS) return status;
+  mapserv->map->cellsize = msAdjustExtent(&(work_extent), mapserv->map->width, mapserv->map->height); /* we do this cause we need a scale */
+  if((status = msCalculateScale(work_extent, mapserv->map->units, mapserv->map->width, mapserv->map->height, mapserv->map->resolution, &mapserv->map->scaledenom)) != MS_SUCCESS) return status;
 
   if((mapserv->map->scaledenom < mapserv->map->web.minscaledenom) && (mapserv->map->web.minscaledenom > 0)) {
     if(mapserv->map->web.mintemplate) { /* use the template provided */