[fdo-commits] r114 - trunk/Providers/WMS/Src/Provider

[svn_fdo at osgeo.org]

Author: romicadascalescu
Date: 2007-01-24 16:51:45 -0500 (Wed, 24 Jan 2007)
New Revision: 114

Modified:
   trunk/Providers/WMS/Src/Provider/FdoWmsSelectCommand.cpp
Log:
Fixed WMS: Default width and height are not accepted - fixed Linux build issue

Modified: trunk/Providers/WMS/Src/Provider/FdoWmsSelectCommand.cpp
===================================================================
--- trunk/Providers/WMS/Src/Provider/FdoWmsSelectCommand.cpp	2007-01-24 21:50:34 UTC (rev 113)
+++ trunk/Providers/WMS/Src/Provider/FdoWmsSelectCommand.cpp	2007-01-24 21:51:45 UTC (rev 114)
@@ -826,7 +826,7 @@
     double deltaExtentsY = fabs(dMaxY - dMinY);
  
     // Adjust resolution to the next power of 2
-    FdoSize maxresolution = max(resolutionX,resolutionY);
+    FdoSize maxresolution = (((resolutionX) > (resolutionY)) ? (resolutionX) : (resolutionY));
     FdoSize power2resolution;
     for (power2resolution=1; power2resolution<MAXPOWER2RESOLUTION && power2resolution<maxresolution; power2resolution<<=1)
         ;