Switch server-side mapimg to Qt #2334
Conversation
It will eventually replace the PPM backend, but for now produces PNG.
PNG is just a better default.
We will always use Qt since it supports everything we need.
Let the user set any image format supported by Qt.
| @@ -22,12 +22,10 @@ install( | |||
| ${CMAKE_SOURCE_DIR}/dist/licenses/FTL.txt | |||
| ${CMAKE_SOURCE_DIR}/dist/licenses/GPL2.txt | |||
| ${CMAKE_SOURCE_DIR}/dist/licenses/GPL3.txt | |||
| ${CMAKE_SOURCE_DIR}/dist/licenses/IMAGEMAGICK.txt | |||
There was a problem hiding this comment.
I think we should delete this file too.
There was a problem hiding this comment.
My bad, I missed that there were two licenses for ImageMagick
|
You also need to update the github action workflow files and readme to remove the dependency. |
I don't see it there - we never supported building with ImageMagick, I think the mention in the docs was a leftover from upstream. |
I am referring to the installation of a library we no long need that is referred to in the README and the gh actions build files. You removed it from docs, but it still remains in other places. |
|
I don't understand... this is the full list of packages we install on Ubuntu: freeciv21/.github/workflows/build.yaml Lines 43 to 55 in 572b15e And on Windows: freeciv21/.github/workflows/build.yaml Lines 140 to 151 in 572b15e What do you want me to remove? |
|
Ok I stand corrected. I guess we had a dep install in docs that we didn't do anywhere else. |
The server-side map image code was using a handcrafted ppm writer. This produces huge files. Since we have Qt with many built-in image writers, use that instead. This also changes the default to png since it's just a better format; and replaces the black background with transparent.