From: ol.sc
Date: Sun, 10 Jun 2012 17:52:23 +0000 (+0000)
Subject: Replaced (broken) assert() with #error and added a source bitmap.
X-Git-Tag: V2.14~368
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cc5fd1dd72f74954c772814bc7f5c644497497c0;p=cc65
Replaced (broken) assert() with #error and added a source bitmap.
git-svn-id: svn://svn.cc65.org/cc65/trunk@5700 b7a2c559-68d2-44c3-8de9-860c34a00d81
---
diff --git a/samples/geos/bitmap-demo.c b/samples/geos/bitmap-demo.c
index 8aa687d07..0e7d0d2aa 100644
--- a/samples/geos/bitmap-demo.c
+++ b/samples/geos/bitmap-demo.c
@@ -4,22 +4,22 @@
* 2012-06-10, Oliver Schmidt (ol.sc@web.de)
*
* To create bitmap.c use the sp65 sprite and bitmap utility:
- * sp65 -r .pcx -c geos-bitmap -w bitmap.c,ident=bitmap
+ * sp65 -r logo.pcx -c geos-bitmap -w bitmap.c,ident=bitmap
*
*/
-#include
#include
#include
#include "bitmap.c"
-
-//assert(bitmap_COLORS == 2);
-//assert(bitmap_WIDTH%8 == 0);
-//assert(bitmap_WIDTH <= SC_PIX_WIDTH);
-//assert(bitmap_HEIGHT <= SC_PIX_HEIGHT);
+#if (!(bitmap_COLORS == 2 && \
+ bitmap_WIDTH%8 == 0 && \
+ bitmap_WIDTH <= SC_PIX_WIDTH && \
+ bitmap_HEIGHT <= SC_PIX_HEIGHT))
+#error Incompatible Bitmap
+#endif
struct iconpic picture = {(char*)bitmap, 0, 0, bitmap_WIDTH/8, bitmap_HEIGHT};
diff --git a/samples/geos/logo.pcx b/samples/geos/logo.pcx
new file mode 100644
index 000000000..848cae745
Binary files /dev/null and b/samples/geos/logo.pcx differ