[mapserver-commits] r11177 - trunk/mapserver

[svn at osgeo.org]

Author: sdlime
Date: 2011-03-16 12:29:01 -0700 (Wed, 16 Mar 2011)
New Revision: 11177

Modified:
   trunk/mapserver/mapfile.c
   trunk/mapserver/mapfile.h
   trunk/mapserver/maplexer.l
Log:
Removed unused APLHACOLOR and ALPHARANGECOLOR keywords.

Modified: trunk/mapserver/mapfile.c
===================================================================
--- trunk/mapserver/mapfile.c	2011-03-16 19:01:00 UTC (rev 11176)
+++ trunk/mapserver/mapfile.c	2011-03-16 19:29:01 UTC (rev 11177)
@@ -429,7 +429,7 @@
       hex[0] = msyytext[5];
       hex[1] = msyytext[6];
       color->blue = msHexToInt(hex);
-	  color->alpha = 0;
+      color->alpha = 0;
 
       return(MS_SUCCESS);
     }
@@ -1682,11 +1682,6 @@
     case(BUFFER):
       if(getInteger(&(label->buffer)) == -1) return(-1);
       break;
-#if ALPHACOLOR_ENABLED
-    case(ALPHACOLOR): 
-      if(loadColorWithAlpha(&(label->color)) != MS_SUCCESS) return(-1);      
-      break;
-#endif
     case(COLOR): 
       if(loadColor(&(label->color), &(label->bindings[MS_LABEL_BINDING_COLOR])) != MS_SUCCESS) return(-1);      
       if(label->bindings[MS_LABEL_BINDING_COLOR].item) label->numbindings++;
@@ -2404,16 +2399,6 @@
       if(loadColor(&(style->color), &(style->bindings[MS_STYLE_BINDING_COLOR])) != MS_SUCCESS) return(MS_FAILURE);
       if(style->bindings[MS_STYLE_BINDING_COLOR].item) style->numbindings++;
       break;
-#if ALPHACOLOR_ENABLED
-    case(ALPHACOLOR):
-      if(loadColorWithAlpha(&(style->color)) != MS_SUCCESS) return(MS_FAILURE);
-      break;
-    case (ALPHACOLORRANGE):
-      /*These will load together*/
-      if(loadColorWithAlpha(&(style->mincolor)) != MS_SUCCESS) return(MS_FAILURE);
-      if(loadColorWithAlpha(&(style->maxcolor)) != MS_SUCCESS) return(MS_FAILURE);
-      break;
-#endif
     case(EOF):
       msSetError(MS_EOFERR, NULL, "loadStyle()");
       return(MS_FAILURE); /* missing END (probably) */
@@ -3039,13 +3024,6 @@
       if(loadColor(&(class->styles[0]->color), NULL) != MS_SUCCESS) return(-1);
       class->numstyles = 1; /* must *always* set a color or outlinecolor */
       break;
-#if ALPHACOLOR_ENABLED
-    case(ALPHACOLOR):
-      if (msMaybeAllocateClassStyle(class, 0)) return MS_FAILURE;
-      if(loadColorWithAlpha(&(class->styles[0]->color)) != MS_SUCCESS) return(-1);
-      class->numstyles = 1; /* must *always* set a color, symbol or outlinecolor */
-      break;
-#endif
     case(MAXSIZE):
       if (msMaybeAllocateClassStyle(class, 0)) return MS_FAILURE;
       if(getDouble(&(class->styles[0]->maxsize)) == -1) return(-1);
@@ -4008,11 +3986,6 @@
     case(COLOR):
       if(loadColor(&(ref->color), NULL) != MS_SUCCESS) return(-1);
       break;
-#if ALPHACOLOR_ENABLED
-    case(ALPHACOLOR):
-      if(loadColorWithAlpha(&(ref->color)) != MS_SUCCESS) return(-1);
-      break;
-#endif
     case(EXTENT):
       if(getDouble(&(ref->extent.minx)) == -1) return(-1);
       if(getDouble(&(ref->extent.miny)) == -1) return(-1);
@@ -4492,11 +4465,6 @@
     case(COLOR):
       if(loadColor(&(scalebar->color), NULL) != MS_SUCCESS) return(-1);   
       break;
-#if ALPHACOLOR_ENABLED
-    case(ALPHACOLOR):
-      if(loadColorWithAlpha(&(scalebar->color)) != MS_SUCCESS) return(-1);   
-      break;
-#endif
     case(EOF):
       msSetError(MS_EOFERR, NULL, "loadScalebar()");      
       return(-1);
@@ -4623,11 +4591,6 @@
     case(COLOR):      
       loadColor(&(querymap->color), NULL);
       break;
-#if ALPHACOLOR_ENABLED
-    case(ALPHACOLOR):      
-      loadColorWithAlpha(&(querymap->color));
-      break;
-#endif
     case(EOF):
       msSetError(MS_EOFERR, NULL, "loadQueryMap()");
       return(-1);

Modified: trunk/mapserver/mapfile.h
===================================================================
--- trunk/mapserver/mapfile.h	2011-03-16 19:01:00 UTC (rev 11176)
+++ trunk/mapserver/mapfile.h	2011-03-16 19:29:01 UTC (rev 11177)
@@ -202,7 +202,6 @@
 #define MAXSUBDIVIDE 1146
 #define MINSUBDIVIDE  1147
 #define LABELFORMAT  1148
-#define ALPHACOLOR	1149
 
 #define DATAPATTERN 1150
 #define FILEPATTERN 1151
@@ -237,7 +236,6 @@
 
  /* Color Range support (was Gradient Support)*/
 #define COLORRANGE 1170
-#define ALPHACOLORRANGE 1171
 #define DATARANGE 1172
 #define RANGEITEM 1173
 

Modified: trunk/mapserver/maplexer.l
===================================================================
--- trunk/mapserver/maplexer.l	2011-03-16 19:01:00 UTC (rev 11176)
+++ trunk/mapserver/maplexer.l	2011-03-16 19:29:01 UTC (rev 11177)
@@ -167,12 +167,10 @@
 <EXPRESSION_STRING>fromtext                    { return(MS_TOKEN_FUNCTION_FROMTEXT); }
 
 <INITIAL>colorrange                            { return(COLORRANGE); }
-<INITIAL>alphacolorrange                       { return(ALPHACOLORRANGE); }
 <INITIAL>datarange                             { return(DATARANGE); }
 <INITIAL>rangeitem                             { return(RANGEITEM); }
 
 <INITIAL,URL_STRING>align                       { return(ALIGN); }
-<INITIAL>alphacolor                            { return(ALPHACOLOR); }
 <INITIAL,URL_VARIABLE,URL_STRING>angle         { return(ANGLE); }
 <INITIAL,URL_STRING>antialias                  { return(ANTIALIAS); }
 <INITIAL,URL_STRING>backgroundcolor            { return(BACKGROUNDCOLOR); }