Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix for issue 4225
  • Loading branch information
jlarouche committed Aug 14, 2012
1 parent 917ce92 commit d6c02b4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions HISTORY.TXT
Expand Up @@ -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): 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) - Fixed PHP MapScript support for PHP 5.4 (#4309)


- Fix msOGREscapeSQLParam could return random data (#4335) - Fix msOGREscapeSQLParam could return random data (#4335)
Expand Down
4 changes: 4 additions & 0 deletions mapsymbol.c
Expand Up @@ -601,6 +601,10 @@ int msGetMarkerSize(symbolSetObj *symbolset, styleObj *style, int *width, int *h
} }


symbol = symbolset->symbol[style->symbol]; 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) { if(style->size == -1) {
size = MS_NINT( msSymbolGetDefaultSize(symbol) * scalefactor ); size = MS_NINT( msSymbolGetDefaultSize(symbol) * scalefactor );
} }
Expand Down

0 comments on commit d6c02b4

Please sign in to comment.