Fix rectObj/shapeObj draw function rendering when setting text proper…

…ty in mapscript (closes #4577)

mapdraw.c

@@ -1973,6 +1973,14 @@ int msDrawShape(mapObj *map, layerObj *layer, shapeObj *shape, imageObj *image,
   msDrawStartShape(map, layer, image, shape);
   c = shape->classindex;
 
+  /* When creating a shape in mapscript and setting the shape.text directly, the
+     text rendering fails without this #4577. If annotext of the first label is
+     not null, msShapeGetAnnotation has already been called: do nothing */
+  if(layer->class[c]->numlabels > 0 && shape->text &&
+     (layer->class[c]->labels[0] && layer->class[c]->labels[0]->annotext==NULL)) {
+    msShapeGetAnnotation(layer, shape);
+  }
+
   /* Before we do anything else, we will check for a rangeitem.
      If its there, we need to change the style's color to map
      the range to the shape */

mapscript/php/mapscript_i.c

@@ -1478,10 +1478,8 @@ int rectObj_draw(rectObj *self, mapObj *map, layerObj *layer,
   msRectToPolygon(*self, &shape);
   shape.classindex = classindex;
 
-  if (text) {
+  if (text)
     shape.text = strdup(text);
-    msShapeGetAnnotation(layer, &shape);
-  }
 
   msDrawShape(map, layer, &shape, img, -1, MS_DRAWMODE_FEATURES|MS_DRAWMODE_LABELS);
 

mapscript/swiginc/rect.i

@@ -91,7 +91,7 @@
         msRectToPolygon(*self, &shape);
         shape.classindex = classindex;
         shape.text = strdup(text);
-
+        
         msDrawShape(map, layer, &shape, image, -1, MS_DRAWMODE_FEATURES|MS_DRAWMODE_LABELS);
 
         msFreeShape(&shape);