Skip to content
Permalink
Browse files

Fix for issue 4225

  • Loading branch information
jlarouche committed Aug 14, 2012
1 parent 917ce92 commit d6c02b40b64f3af30031c373335406fd2be5957a
Showing with 6 additions and 0 deletions.
  1. +2 −0 HISTORY.TXT
  2. +4 −0 mapsymbol.c
@@ -14,6 +14,8 @@ For a complete change history, please see the Git log comments.
Current Version (future 6.0.4, GIT branch-6-0):
-----------------------------------------------

- Fixed "msGetMarkerSize() called on unloaded pixmap symbol" in mapsymbol.c (#4225)

- Fixed PHP MapScript support for PHP 5.4 (#4309)

- Fix msOGREscapeSQLParam could return random data (#4335)
@@ -601,6 +601,10 @@ int msGetMarkerSize(symbolSetObj *symbolset, styleObj *style, int *width, int *h
}

symbol = symbolset->symbol[style->symbol];
if (symbol->type == MS_SYMBOL_PIXMAP && !symbol->pixmap_buffer) {
if (MS_SUCCESS != msPreloadImageSymbol(MS_MAP_RENDERER(symbolset->map), symbol))
return MS_FAILURE;
}
if(style->size == -1) {
size = MS_NINT( msSymbolGetDefaultSize(symbol) * scalefactor );
}

0 comments on commit d6c02b4

Please sign in to comment.
You can’t perform that action at this time.