zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-20 23:51:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add '-set colorspace RGB' to some icon convert commands.

Browse Source 
Its absence was breaking the icon build on Ubuntu 14.04, because you
ask convert to map an image into a specific 16-colour palette, and it
does so and _then_ nonconsensually maps those colours in turn through
a colourspace transformation you didn't ask for, causing icon.pl to
fail an assertion when it finds an RGB value not in the palette.
This commit is contained in:
Simon Tatham
2015-10-03 13:15:59 +01:00
parent 9df80d7587
commit c0308c9319
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
icons/Makefile
View File

@ -27,6 +27,10 @@ RC = $(patsubst %,%.rc,$(PUZZLES))
BIN = ../ BIN = ../
PIC = ./ PIC = ./
# Work around newer ImageMagick unilaterally distorting colours when
# converting to PNG.
CSP = -set colorspace RGB
base: $(BASE) base: $(BASE)
web: $(WEB) web: $(WEB)
pngicons: $(P48D24) $(P32D24) $(P16D24) pngicons: $(P48D24) $(P32D24) $(P16D24)
@ -93,7 +97,7 @@ $(IBASE): %-ibase.png: %-base.png
# seems to work better than reducing it in 24 bits and then # seems to work better than reducing it in 24 bits and then
# dithering. # dithering.
$(IBASE4): %-ibase4.png: %-ibase.png $(IBASE4): %-ibase4.png: %-ibase.png
convert -colors 16 +dither -map $(PIC)win16pal.xpm $^ $@ convert -colors 16 +dither $(CSP) -map $(PIC)win16pal.xpm $^ $@
# Build the 24-bit PNGs for the icons, at three sizes. # Build the 24-bit PNGs for the icons, at three sizes.
$(P48D24): %-48d24.png: %-ibase.png $(P48D24): %-48d24.png: %-ibase.png
@ -115,15 +119,15 @@ $(P48D8) $(P32D8) $(P16D8): %d8.png: %d24.png
# much...) # much...)
$(P48D4): %-48d4.png: %-ibase4.png $(P48D4): %-48d4.png: %-ibase4.png
$(PIC)square.pl 48 1 $^ $@-tmp2.png $(PIC)square.pl 48 1 $^ $@-tmp2.png
convert -colors 16 -map $(PIC)win16pal.xpm $@-tmp2.png $@ convert -colors 16 $(CSP) -map $(PIC)win16pal.xpm $@-tmp2.png $@
rm -f $@-tmp2.png rm -f $@-tmp2.png
$(P32D4): %-32d4.png: %-ibase.png $(P32D4): %-32d4.png: %-ibase.png
$(PIC)square.pl 32 1 $^ $@-tmp2.png $(PIC)square.pl 32 1 $^ $@-tmp2.png
convert -colors 16 -map $(PIC)win16pal.xpm $@-tmp2.png $@ convert -colors 16 $(CSP) -map $(PIC)win16pal.xpm $@-tmp2.png $@
rm -f $@-tmp2.png rm -f $@-tmp2.png
$(P16D4): %-16d4.png: %-ibase.png $(P16D4): %-16d4.png: %-ibase.png
$(PIC)square.pl 16 1 $^ $@-tmp2.png $(PIC)square.pl 16 1 $^ $@-tmp2.png
convert -colors 16 -map $(PIC)win16pal.xpm $@-tmp2.png $@ convert -colors 16 $(CSP) -map $(PIC)win16pal.xpm $@-tmp2.png $@
rm -f $@-tmp2.png rm -f $@-tmp2.png
# Build the actual Windows icons themselves, by feeding all those # Build the actual Windows icons themselves, by feeding all those