Set a transparency threshold for the XPM icons. Have the make-icons script

constify the XPMs.

svn path=/trunk/; revision=19883

1 files changed, 7 insertions, 2 deletions

diff --git a/image/make-icons b/image/make-icons
index 866ef4ba17..e7e6018094 100755
--- a/image/make-icons
+++ b/image/make-icons
@@ -3,14 +3,19 @@
 RESOLUTIONS="64 48 32 16"
 
 CONVERT=convert
+XPM_OPTS="-channel A -threshold 50%"
 
 for RES in 64 48 32 16 ; do
     $CONVERT -resize ${RES}x${RES} wsicon256.png wsicon${RES}.png
-    $CONVERT -resize ${RES}x${RES} wsicon256.png wsicon${RES}.xpm
+    $CONVERT -resize ${RES}x${RES} $XPM_OPTS wsicon256.png xpm:- | \
+        sed -e "s/^static char \*-/static const char *wsicon${RES}_xpm/" > \
+        wsicon${RES}.xpm
 done
 
 for RES in 48 32 16 ; do
-    $CONVERT -resize ${RES}x${RES} wsiconcap256.png wsiconcap${RES}.xpm
+    $CONVERT -resize ${RES}x${RES} $XPM_OPTS wsiconcap256.png xpm:- | \
+        sed -e "s/^static char \*-/static const char *wsiconcap${RES}_xpm/" > \
+        wsiconcap${RES}.xpm
 done