From: jmcmullan <jmcmullan@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Wed, 28 Nov 2012 21:03:57 +0000 (+0000)
Subject: ilbmtoicon: Refuse to generate icons with differently sized select and normal images
X-Git-Url: https://repo.or.cz/w/AROS.git/commitdiff_plain/dcd71fa81178a9c60e11632ffcc6d2216213f2e1

ilbmtoicon: Refuse to generate icons with differently sized select and normal images

Signed-off-by: Jason S. McMullan <jason.mcmullan@gmail.com>

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@46118 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---

diff --git a/tools/ilbmtoicon/ilbmtoicon.c b/tools/ilbmtoicon/ilbmtoicon.c
index b6be462fe9..9feaf23b61 100644
--- a/tools/ilbmtoicon/ilbmtoicon.c
+++ b/tools/ilbmtoicon/ilbmtoicon.c
@@ -2095,7 +2095,14 @@ int main(int argc, char **argv)
     getarguments(argc, argv);
     parseiconsource();
     loadimage(image1option, &img1);
-    if (image2option) loadimage(image2option, &img2);
+    if (image2option) {
+        loadimage(image2option, &img2);
+        if ((img2.bmh.bmh_Width && img2.bmh.bmh_Width != img1.bmh.bmh_Width) ||
+            (img2.bmh.bmh_Height && img2.bmh.bmh_Height != img1.bmh.bmh_Height)) {
+            fprintf(stderr, "%s: Image %s (%dx%d) is not the same size as Image %s (%dx%d)\n", argv[0], image1option, img1.bmh.bmh_Width, img1.bmh.bmh_Height, image2option, img2.bmh.bmh_Width, img2.bmh.bmh_Height);
+        }
+    }
+                        
     remapicon();
     writeicon();