Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Legendicon 500 error #5926

Merged
merged 7 commits into from Nov 21, 2019
Merged

Legendicon 500 error #5926

merged 7 commits into from Nov 21, 2019

Conversation

@sdlime
Copy link
Member

sdlime commented Nov 21, 2019

This fixes an error (segfault) with legendicon requests against certain layer/class configurations. In my case it was with lines using TrueType symbols placed along the line (e.g. railroad ties).

--Steve

@sdlime

This comment has been minimized.

Copy link
Member Author

sdlime commented Nov 21, 2019

Should squish/squash to one commit message. @rouault, can this be done from the UI or does one have to go to the command line? The fix itself is trivial.

@rouault

This comment has been minimized.

Copy link
Contributor

rouault commented Nov 21, 2019

can this be done from the UI

Sure. Just at the right of the "Merge pull request" button there is a small bottom-oriented arrow ti display a combobox. Click on it and select "Squash and merge". Then click on the updated button, and adjust the squashed commit title and message. Note: the setting will apparently remain for next visits. So be careful to check it if you want to do a regular merge rather than a squash

@sdlime sdlime merged commit 0af5737 into mapserver:master Nov 21, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@sdlime

This comment has been minimized.

Copy link
Member Author

sdlime commented Nov 21, 2019

Woot! Thanks, never noticed that before. --Steve

@sdlime sdlime deleted the sdlime:legendicon-500-error branch Nov 21, 2019
@sdlime sdlime self-assigned this Nov 22, 2019
sdlime added a commit that referenced this pull request Dec 12, 2019
This fixes a segfault issue with mode=legendicon and certain conditions where the opaque pointer back to the parent mapObj is used, for instance when dealing with truetype symbols along a line.
jmckenna added a commit that referenced this pull request Dec 13, 2019
Backport pull request #5926 from master.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.