Skip to content

Commit e1a3b57

Browse files
Charles Plantedmorissette
authored andcommitted
Ticket #5917 Dont fail when rendering UTFGrid with outline
1 parent 0fcc810 commit e1a3b57

3 files changed

Lines changed: 7 additions & 1 deletion

File tree

maputfgrid.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,10 @@ int utfgridRenderLine(imageObj *img, shapeObj *lineshape, strokeStyleObj *linest
667667

668668
/* utfvalue is set to 0 if the shape isn't in the table. */
669669
if(r->utfvalue == 0) {
670-
return MS_FAILURE;
670+
return MS_SUCCESS;
671+
/* If we dont get a caracter to draw we just skip execution
672+
* instead of failing
673+
*/
671674
}
672675

673676
/* Render the line */
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"grid":[" "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," !!!!! "," !!!!!!!!!!!!!!! "," !!!!!!!!!!!!!!!!!!!!!!!!! "," !!!!!!!!!!!!!!!!!!!!! !!! "," !!!!!!!!!!!! !!! "," !!!! !!! "," !!! !!! "," !! !! "," !! $$$ "," !!! $$$$$$$ "," !!! $$$$ $$$$$ !! "," !! $$$$ $$$$ !! "," !!! $$$$$ $$ !! ### "," !!! $$$$ !! ##### "," !! $$$$$ !! ##### "," !! $$$$$ !!! ###### "," !!! $$$$ !!! ##### "," !!! $$$$$ !!! #### "," !! $$$$ !! ### "," !! $$$$$ !! ### ","!!! $$$$$ !! ### ","!!! $$$$ !! #### ##","!! $$$$$ !! #### ##","!! $$$$ !!!! #### ###","!! $$$ !!!!!!! ### ####","!! $$ !!!!!!!! ###### ### ","!!!! !!!!!!!! ######## ### ","!!!!!!! !!!!!!!! ###### ### "," !!!!!!! !!!!!!!! #### ## "," !!!!!! !!!!!!!! #### ## "," !!!!!!! !!!!!!!! ####### ## "," !!!!!!!!!!!!! ########### ### "," !!!!!!!! ############# "," !!! ####### "," # "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "," "],"keys":["","1","2","3"],"data":{}}

msautotest/renderers/line_label_auto.map

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# RUN_PARMS: line_label_auto.png [SHP2IMG] -m [MAPFILE] -i png -o [RESULT]
22
# RUN_PARMS: line_label_auto.pdf [SHP2IMG] -m [MAPFILE] -i pdf -o [RESULT]
33
# RUN_PARMS: line_label_auto.svg [SHP2IMG] -m [MAPFILE] -i svg -o [RESULT]
4+
# RUN_PARMS: line_label_auto.json [SHP2IMG] -m [MAPFILE] -i json -o [RESULT]
45
# RUN_PARMS: line_label_auto.cairo.png [SHP2IMG] -m [MAPFILE] -i cairopng -o [RESULT]
56
#
67
map
@@ -41,3 +42,4 @@ layer
4142
end
4243

4344
end
45+

0 commit comments

Comments
 (0)