[mapserver-commits] r13153 - in branches/branch-6-0/mapserver: . mapscript/php

[svn at osgeo.org]

Author: aboudreault
Date: 2012-02-15 11:00:15 -0800 (Wed, 15 Feb 2012)
New Revision: 13153

Modified:
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapscript/php/php_mapscript.c
Log:
Backport 6.0: Added MS_CJC_* constants in PHP/MapScript (#4183)

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2012-02-15 18:59:22 UTC (rev 13152)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2012-02-15 19:00:15 UTC (rev 13153)
@@ -15,6 +15,8 @@
 Current Version (future 6.0.3, SVN branch-6-0):
 ---------------------------
 
+- Added MS_CJC_* constants in PHP/MapScript (#4183)
+
 - Fixed Memory leak with fribidi strings (#4188)
 
 - Added missing properties in styleObj setter of PHP/MapScript (#3901)

Modified: branches/branch-6-0/mapserver/mapscript/php/php_mapscript.c
===================================================================
--- branches/branch-6-0/mapserver/mapscript/php/php_mapscript.c	2012-02-15 18:59:22 UTC (rev 13152)
+++ branches/branch-6-0/mapserver/mapscript/php/php_mapscript.c	2012-02-15 19:00:15 UTC (rev 13153)
@@ -1193,6 +1193,15 @@
     REGISTER_LONG_CONSTANT("MS_LABEL_BINDING_SHADOWSIZEX", MS_LABEL_BINDING_SHADOWSIZEX, const_flag);
     REGISTER_LONG_CONSTANT("MS_LABEL_BINDING_SHADOWSIZEY", MS_LABEL_BINDING_SHADOWSIZEY, const_flag);
 
+    /* MS_CAPS_JOINS_AND_CORNERS */
+    REGISTER_LONG_CONSTANT("MS_CJC_NONE", MS_CJC_NONE, const_flag);
+    REGISTER_LONG_CONSTANT("MS_CJC_BEVEL", MS_CJC_BEVEL, const_flag);
+    REGISTER_LONG_CONSTANT("MS_CJC_BUTT", MS_CJC_BUTT, const_flag); 
+    REGISTER_LONG_CONSTANT("MS_CJC_MITER", MS_CJC_MITER, const_flag); 
+    REGISTER_LONG_CONSTANT("MS_CJC_ROUND", MS_CJC_ROUND, const_flag); 
+    REGISTER_LONG_CONSTANT("MS_CJC_SQUARE", MS_CJC_SQUARE, const_flag); 
+    REGISTER_LONG_CONSTANT("MS_CJC_TRIANGLE", MS_CJC_TRIANGLE, const_flag); 
+
     /*cgi request types*/
     REGISTER_LONG_CONSTANT("MS_GET_REQUEST", MS_GET_REQUEST, const_flag);
     REGISTER_LONG_CONSTANT("MS_POST_REQUEST", MS_POST_REQUEST, const_flag);