From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Sun, 11 Mar 2012 22:43:44 +0000 (+0000)
Subject: Added conversion to GEOS icon format (which is actually identical to the VIC2
X-Git-Tag: V2.14~451
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=422629ff9190d9c18a2de791b2f169cad7c04f46;p=cc65

Added conversion to GEOS icon format (which is actually identical to the VIC2
high-res sprite format).


git-svn-id: svn://svn.cc65.org/cc65/trunk@5612 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/doc/sp65.sgml b/doc/sp65.sgml
index e1ecd061a..afde57a0b 100644
--- a/doc/sp65.sgml
+++ b/doc/sp65.sgml
@@ -143,10 +143,16 @@ attribute lists see <ref id="attr-lists" name="below">.
 <sect>Conversions<label id="conversions"><p>
 
 
-<sect1>VIC2 sprites<p>
+<sect1>GEOS icon<p>
 
 
-<sect1>Koala images<p>
+<sect1>Koala image<p>
+
+
+<sect1>Lynx sprite<p>
+
+
+<sect1>VIC2 sprite<p>
 
 
 
diff --git a/src/sp65/convert.c b/src/sp65/convert.c
index 170001427..0063bf261 100644
--- a/src/sp65/convert.c
+++ b/src/sp65/convert.c
@@ -39,6 +39,7 @@
 #include "attr.h"
 #include "convert.h"
 #include "error.h"
+#include "geosicon.h"
 #include "koala.h"
 #include "lynxsprite.h"
 #include "vic2sprite.h"
@@ -60,6 +61,7 @@ struct ConverterMapEntry {
 
 /* Converter table, alphabetically sorted */
 static const ConverterMapEntry ConverterMap[] = {
+    {   "geos-icon",            GenGeosIcon     },
     {   "koala",                GenKoala        },
     {   "lynx-sprite",          GenLynxSprite   },
     {   "vic2-sprite",          GenVic2Sprite   },
@@ -117,4 +119,4 @@ void ListConversionTargets (FILE* F)
         fprintf (F, "  %s\n", ConverterMap[I].Format);
     }
 }
-                
+
diff --git a/src/sp65/geosicon.c b/src/sp65/geosicon.c
new file mode 100644
index 000000000..52a8945ee
--- /dev/null
+++ b/src/sp65/geosicon.c
@@ -0,0 +1,113 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                geosicon.c                                 */
+/*                                                                           */
+/*      GEOS icon format backend for the sp65 sprite and bitmap utility      */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2012,      Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+/* common */
+#include "attrib.h"
+#include "print.h"
+
+/* sp65 */
+#include "attr.h"
+#include "error.h"
+#include "geosicon.h"
+
+
+
+/*****************************************************************************/
+/*                                   Data                                    */
+/*****************************************************************************/
+
+
+
+/* Screen size of geos icon */
+#define WIDTH           24U
+#define HEIGHT          21U
+
+
+
+/*****************************************************************************/
+/*                                   Code                                    */
+/*****************************************************************************/
+
+
+
+StrBuf* GenGeosIcon (const Bitmap* B, const Collection* A attribute ((unused)))
+/* Generate binary output in GEOS icon format for the bitmap B. The output
+ * is stored in a string buffer (which is actually a dynamic char array) and
+ * returned.
+ */
+{
+    StrBuf* D;
+    unsigned X, Y;
+
+
+    /* Output the image properties */
+    Print (stdout, 1, "Image is %ux%u with %u colors%s\n",
+           GetBitmapWidth (B), GetBitmapHeight (B), GetBitmapColors (B),
+           BitmapIsIndexed (B)? " (indexed)" : "");
+
+    /* Check the bitmap properties */
+    if (!BitmapIsIndexed (B)            ||
+        GetBitmapHeight (B) != HEIGHT   ||
+        GetBitmapWidth (B) != WIDTH     ||
+        GetBitmapColors (B) > 2) {
+        Error ("Invalid bitmap properties for conversion to GEOS icon");
+    }
+
+    /* Create the output buffer and resize it to the required size. */
+    D = NewStrBuf ();
+    SB_Realloc (D, 63);
+
+    /* Convert the image */
+    for (Y = 0; Y < HEIGHT; ++Y) {
+        unsigned char V = 0;
+        for (X = 0; X < WIDTH; ++X) {
+
+            /* Fetch next bit into byte buffer */
+            V = (V << 1) | (GetPixel (B, X, Y).Index & 0x01);
+
+            /* Store full bytes into the output buffer */
+            if ((X & 0x07) == 0x07) {
+                SB_AppendChar (D, V);
+                V = 0;
+            }
+        }
+    }
+
+    /* Return the converted bitmap */
+    return D;
+}
+
+
+
diff --git a/src/sp65/geosicon.h b/src/sp65/geosicon.h
new file mode 100644
index 000000000..3a54b70cc
--- /dev/null
+++ b/src/sp65/geosicon.h
@@ -0,0 +1,69 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                geosicon.h                                 */
+/*                                                                           */
+/*      GEOS icon format backend for the sp65 sprite and bitmap utility      */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (C) 2012,      Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
+/*                                                                           */
+/*                                                                           */
+/* This software is provided 'as-is', without any expressed or implied       */
+/* warranty.  In no event will the authors be held liable for any damages    */
+/* arising from the use of this software.                                    */
+/*                                                                           */
+/* Permission is granted to anyone to use this software for any purpose,     */
+/* including commercial applications, and to alter it and redistribute it    */
+/* freely, subject to the following restrictions:                            */
+/*                                                                           */
+/* 1. The origin of this software must not be misrepresented; you must not   */
+/*    claim that you wrote the original software. If you use this software   */
+/*    in a product, an acknowledgment in the product documentation would be  */
+/*    appreciated but is not required.                                       */
+/* 2. Altered source versions must be plainly marked as such, and must not   */
+/*    be misrepresented as being the original software.                      */
+/* 3. This notice may not be removed or altered from any source              */
+/*    distribution.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+#ifndef GEOSICON_H
+#define GEOSICON_H
+
+
+
+/* common */
+#include "coll.h"
+#include "strbuf.h"
+
+/* sp65 */
+#include "bitmap.h"
+
+
+
+/*****************************************************************************/
+/*                                   Code                                    */
+/*****************************************************************************/
+
+
+
+StrBuf* GenGeosIcon (const Bitmap* B, const Collection* A);
+/* Generate binary output in GEOS icon format for the bitmap B. The output
+ * is stored in a string buffer (which is actually a dynamic char array) and
+ * returned.
+ */
+
+
+
+/* End of geosicon.h */
+
+#endif
+
+
+
diff --git a/src/sp65/make/gcc.mak b/src/sp65/make/gcc.mak
index 045b792d5..29cc42a60 100644
--- a/src/sp65/make/gcc.mak
+++ b/src/sp65/make/gcc.mak
@@ -31,6 +31,7 @@ OBJS = 	asm.o           \
         convert.o       \
         error.o	    	\
         fileio.o        \
+        geosicon.o      \
         input.o         \
         koala.o         \
 	lynxsprite.o    \
diff --git a/src/sp65/make/watcom.mak b/src/sp65/make/watcom.mak
index ff3838c20..0b724491e 100644
--- a/src/sp65/make/watcom.mak
+++ b/src/sp65/make/watcom.mak
@@ -69,6 +69,7 @@ OBJS =  asm.obj         \
         convert.obj     \
         error.obj     	\
         fileio.obj      \
+        geosicon.obj    \
         input.obj       \
         koala.obj       \
         lynxsprite.obj  \