[mapserver-commits] r9385 - trunk/mapserver
svn at osgeo.org
svn at osgeo.org
Tue Oct 6 13:54:12 EDT 2009
Author: aboudreault
Date: 2009-10-06 13:54:12 -0400 (Tue, 06 Oct 2009)
New Revision: 9385
Modified:
trunk/mapserver/HISTORY.TXT
trunk/mapserver/mapagg.cpp
trunk/mapserver/mapgd.c
trunk/mapserver/mapimagemap.c
trunk/mapserver/maplabel.c
trunk/mapserver/mappdf.c
trunk/mapserver/mapprimitive.c
trunk/mapserver/maprendering.c
trunk/mapserver/mapsvg.c
trunk/mapserver/mapswf.c
trunk/mapserver/mapsymbol.c
Log:
Reversed MAXWIDTH/MINWIDTH change: due to the current API, can't be fixed for 5.6 (#3153)
Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT 2009-10-06 17:38:52 UTC (rev 9384)
+++ trunk/mapserver/HISTORY.TXT 2009-10-06 17:54:12 UTC (rev 9385)
@@ -13,9 +13,6 @@
Current Version (SVN trunk):
----------------------------
-
-- Fixed some style properties are not scaled with resolution (#3153)
-
- Fixed anchor point of vertically stacked bar graphs
- Fixed TEXT property cannot be removed in the CLASS object. PHP/Mapscript (#3063)
Modified: trunk/mapserver/mapagg.cpp
===================================================================
--- trunk/mapserver/mapagg.cpp 2009-10-06 17:38:52 UTC (rev 9384)
+++ trunk/mapserver/mapagg.cpp 2009-10-06 17:54:12 UTC (rev 9385)
@@ -1044,8 +1044,8 @@
size = MS_MIN(size, style->maxsize);
width = style->width*scalefactor;
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
angle = (style->angle) ? style->angle : 0.0;
angle_radians = angle*MS_DEG_TO_RAD;
@@ -1210,8 +1210,8 @@
else
d = 1;
width = MS_NINT(style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
angle = (style->angle) ? style->angle : 0.0;
angle_radians = angle*MS_DEG_TO_RAD;
@@ -1575,8 +1575,8 @@
size = MS_MIN(size, style->maxsize);
width = (style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
ox = style->offsetx * scalefactor;
oy = style->offsety * scalefactor;
@@ -1764,8 +1764,8 @@
size = MS_MIN(size, style->maxsize);
width = style->width*scalefactor;
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
angle_radians = style->angle*MS_DEG_TO_RAD;
Modified: trunk/mapserver/mapgd.c
===================================================================
--- trunk/mapserver/mapgd.c 2009-10-06 17:38:52 UTC (rev 9384)
+++ trunk/mapserver/mapgd.c 2009-10-06 17:54:12 UTC (rev 9385)
@@ -604,8 +604,8 @@
size = MS_MIN(size, style->maxsize);
width = MS_NINT(style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
gdImageSetThickness(hatch, width);
/* normalize the angle (180 to 0, 0 is east, 90 is north 180 is west) */
@@ -1076,8 +1076,8 @@
size = MS_MIN(size, style->maxsize);
width = MS_NINT(style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
if(style->symbol >= symbolset->numsymbols || style->symbol < 0) return; /* no such symbol, 0 is OK */
if(fc < 0) return; /* nothing to do */
@@ -1288,8 +1288,8 @@
size = MS_MIN(size, style->maxsize);
width = MS_NINT(style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
angle = (style->angle) ? style->angle : 0.0;
angle_radians = angle*MS_DEG_TO_RAD;
@@ -1508,8 +1508,8 @@
size = MS_MIN(size, style->maxsize);
width = MS_NINT(style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
angle = (style->angle) ? style->angle : 0.0;
angle_radians = angle*MS_DEG_TO_RAD;
@@ -1752,8 +1752,8 @@
size = MS_MIN(size, style->maxsize);
width = MS_NINT(style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
angle = (style->angle) ? style->angle : 0.0;
@@ -2029,8 +2029,8 @@
size = MS_MIN(size, style->maxsize);
width = MS_NINT(style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
angle = (style->angle) ? style->angle : 0.0;
angle_radians = angle*MS_DEG_TO_RAD;
Modified: trunk/mapserver/mapimagemap.c
===================================================================
--- trunk/mapserver/mapimagemap.c 2009-10-06 17:38:52 UTC (rev 9384)
+++ trunk/mapserver/mapimagemap.c 2009-10-06 17:54:12 UTC (rev 9385)
@@ -989,8 +989,8 @@
}
else
size = MS_NINT(style->size*scalefactor);
- size = MS_MAX(size, (style->minsize*scalefactor));
- size = MS_MIN(size, (style->maxsize*scalefactor));
+ size = MS_MAX(size, style->minsize);
+ size = MS_MIN(size, style->maxsize);
if(style->symbol > symbolset->numsymbols || style->symbol < 0) return; /* no such symbol, 0 is OK */
/* if(fc<0 && oc<0) return; // nothing to do */
@@ -1197,8 +1197,8 @@
}
else
size = MS_NINT(style->size*scalefactor);
- size = MS_MAX(size, (style->minsize*scalefactor));
- size = MS_MIN(size, (style->maxsize*scalefactor));
+ size = MS_MAX(size, style->minsize);
+ size = MS_MIN(size, style->maxsize);
if(style->symbol > symbolset->numsymbols || style->symbol < 0) return; /* no such symbol, 0 is OK */
if (suppressEmpty && p->numvalues==0) return;/* suppress area with empty title */
@@ -1410,8 +1410,8 @@
}
else
size = MS_NINT(style->size*scalefactor);
- size = MS_MAX(size, (style->minsize*scalefactor));
- size = MS_MIN(size, (style->maxsize*scalefactor));
+ size = MS_MAX(size, style->minsize);
+ size = MS_MIN(size, style->maxsize);
/* DEBUG_IF printf ("a"); */
/* if(fc==-1 && oc!=-1) { // use msDrawLineSymbolIM() instead (POLYLINE) */
Modified: trunk/mapserver/maplabel.c
===================================================================
--- trunk/mapserver/maplabel.c 2009-10-06 17:38:52 UTC (rev 9384)
+++ trunk/mapserver/maplabel.c 2009-10-06 17:54:12 UTC (rev 9385)
@@ -779,8 +779,8 @@
char *font=NULL;
size = label->size*scalefactor;
- size = MS_MAX(size, (label->minsize*scalefactor));
- size = MS_MIN(size, (label->maxsize*scalefactor));
+ size = MS_MAX(size, label->minsize);
+ size = MS_MIN(size, label->maxsize);
font = msLookupHashTable(&(fontset->fonts), label->font);
if(!font) {
Modified: trunk/mapserver/mappdf.c
===================================================================
--- trunk/mapserver/mappdf.c 2009-10-06 17:38:52 UTC (rev 9384)
+++ trunk/mapserver/mappdf.c 2009-10-06 17:54:12 UTC (rev 9385)
@@ -806,8 +806,8 @@
}
else
size = MS_NINT(style->size*scalefactor);
- size = MS_MAX(size, (style->minsize*scalefactor));
- size = MS_MIN(size, (style->maxsize*scalefactor));
+ size = MS_MAX(size, style->minsize);
+ size = MS_MIN(size, style->maxsize);
/* no such symbol, 0 is OK */
if(style->symbol > symbolset->numsymbols || style->symbol < 0)
Modified: trunk/mapserver/mapprimitive.c
===================================================================
--- trunk/mapserver/mapprimitive.c 2009-10-06 17:38:52 UTC (rev 9384)
+++ trunk/mapserver/mapprimitive.c 2009-10-06 17:54:12 UTC (rev 9385)
@@ -1622,8 +1622,8 @@
}
size = label->size*scalefactor;
- size = MS_MAX(size, (label->minsize*scalefactor));
- size = MS_MIN(size, (label->maxsize*scalefactor));
+ size = MS_MAX(size, label->minsize);
+ size = MS_MIN(size, label->maxsize);
font = msLookupHashTable(&(fontset->fonts), label->font);
if(!font) {
Modified: trunk/mapserver/maprendering.c
===================================================================
--- trunk/mapserver/maprendering.c 2009-10-06 17:38:52 UTC (rev 9384)
+++ trunk/mapserver/maprendering.c 2009-10-06 17:54:12 UTC (rev 9385)
@@ -102,8 +102,8 @@
if(MS_VALID_COLOR(s->outlinecolor)) {
s->outlinewidth = src->width * scalefactor;
- s->outlinewidth = MS_MAX(s->outlinewidth, (src->minwidth*scalefactor));
- s->outlinewidth = MS_MIN(s->outlinewidth, (src->maxwidth*scalefactor));
+ s->outlinewidth = MS_MAX(s->outlinewidth, src->minwidth);
+ s->outlinewidth = MS_MIN(s->outlinewidth, src->maxwidth);
} else {
s->outlinewidth = 0;
}
@@ -417,9 +417,9 @@
/* store a reference to the renderer to be used for freeing */
symbol->renderer = renderer;
- width = style->width * scalefactor;
- width = MS_MIN(width, (style->maxwidth*scalefactor));
- width = MS_MAX(width, (style->minwidth*scalefactor));
+ width = style->width * scalefactor;
+ width = MS_MIN(width,style->maxwidth);
+ width = MS_MAX(width,style->minwidth);
if(style->offsety==-99) {
offsetLine = msOffsetPolyline(p,style->offsetx * width,-99);
@@ -588,8 +588,8 @@
size = MS_MIN(size, style->maxsize);
width = style->width * scalefactor;
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
if (symbol->sizey)
scaling = size / symbol->sizey; /* compute the scaling factor (d) on the unrotated symbol */
Modified: trunk/mapserver/mapsvg.c
===================================================================
--- trunk/mapserver/mapsvg.c 2009-10-06 17:38:52 UTC (rev 9384)
+++ trunk/mapserver/mapsvg.c 2009-10-06 17:54:12 UTC (rev 9385)
@@ -549,8 +549,8 @@
size = MS_MIN(size, style->maxsize);
width = MS_NINT(style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
if(style->symbol > symbolset->numsymbols || style->symbol < 0) return; /* no such symbol, 0 is OK */
@@ -1364,8 +1364,8 @@
size = MS_MIN(size, style->maxsize);
width = MS_NINT(style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
if(style->symbol > symbolset->numsymbols || style->symbol < 0) return; /* no such symbol, 0 is OK */
Modified: trunk/mapserver/mapswf.c
===================================================================
--- trunk/mapserver/mapswf.c 2009-10-06 17:38:52 UTC (rev 9384)
+++ trunk/mapserver/mapswf.c 2009-10-06 17:54:12 UTC (rev 9385)
@@ -1990,8 +1990,8 @@
size = MS_MIN(size, style->maxsize);
width = MS_NINT(style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
if(style->symbol > symbolset->numsymbols || style->symbol < 0) /* no such symbol, 0 is OK */
return;
@@ -2120,8 +2120,8 @@
width = MS_NINT(style->width*scalefactor);
- width = MS_MAX(width, (style->minwidth*scalefactor));
- width = MS_MIN(width, (style->maxwidth*scalefactor));
+ width = MS_MAX(width, style->minwidth);
+ width = MS_MIN(width, style->maxwidth);
if(style->symbol > symbolset->numsymbols || style->symbol < 0) /* no such symbol, 0 is OK */
return;
Modified: trunk/mapserver/mapsymbol.c
===================================================================
--- trunk/mapserver/mapsymbol.c 2009-10-06 17:38:52 UTC (rev 9384)
+++ trunk/mapserver/mapsymbol.c 2009-10-06 17:54:12 UTC (rev 9385)
@@ -745,8 +745,8 @@
}
else
size = MS_NINT(style->size*scalefactor);
- size = MS_MAX(size, (style->minsize*scalefactor));
- size = MS_MIN(size, (style->maxsize*scalefactor));
+ size = MS_MAX(size, style->minsize);
+ size = MS_MIN(size, style->maxsize);
switch(symbolset->symbol[style->symbol]->type) {
More information about the mapserver-commits
mailing list