shapeObj.draw & rectObj.draw use incorrect style to draw

[szekerest]

shapeObj.draw and rectObj.draw always draw using a style with index = 1 even 
if the class has only one style (with index = 0). In the latter case 
msDrawShape uses uninitialized style to draw.

To fix this issue shape.i (line 85) should be modifyed to

return msDrawShape(map, layer, self, image, -1);

and rect.i (line 66) should be modifyed to

msDrawShape(map, layer, &shape, image, -1);

respectively.


Tamas Szekeres

[szekerest]

Reassigned as for #1491

[sgillies@…]

Tamas, the class index is carried into msDrawShape by the shapeObj:

    shape.classindex = 2
    shape.draw(map, layer, image)

Do I misunderstand you?

[szekerest]

Sean,

For shapeObj.draw the shape.i contains the followings:
 
int draw(mapObj *map, layerObj *layer, imageObj *image) {
        return msDrawShape(map, layer, self, image, MS_TRUE);
    }

There is a confusion with the 5. parameter of msDrawShape which nomally 
contains the index if the style. It should be -1 to draw all the styles. This 
applies to rectObj.draw as well.

Tamas

[sdlime]

Good catch. I have made the change and committed to CVS...

Steve

[sdlime]

Tamas: Can you confirm this one?

Steve

[szekerest]

Steve

This change works properly. You can close this bug.


For additional comments see:

http://mapserver.gis.umn.edu/bugs/show_bug.cgi?id=1466

Tamas Szekeres

[sdlime]

Marking as closed.