Added a new input layer that manages the different input formats.

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

diff --git a/src/sp65/input.c b/src/sp65/input.c
new file mode 100644 (file)
index 0000000..d7b1768
--- /dev/null
+++ b/src/sp65/input.c
@@ -0,0 +1,106 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                  input.c                                  */
+/*                                                                           */
+/*   Input format/file definitions 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 "fileid.h"
+
+/* sp65 */        
+#include "error.h"
+#include "input.h"
+#include "pcx.h"
+
+
+
+/*****************************************************************************/
+/*                                   Data                                    */
+/*****************************************************************************/
+
+
+
+typedef struct InputFormatDesc InputFormatDesc;
+struct InputFormatDesc {
+
+    /* Read routine */
+    Bitmap* (*Read) (const char* Name);
+
+};
+
+/* Table with input formats */
+static InputFormatDesc InputFormatTable[ifCount] = {
+    {   ReadPCXFile     },
+};
+
+/* Table that maps extensions to input formats. Must be sorted alphabetically */
+static const FileId FormatTable[] = {
+    /* Upper case stuff for obsolete operating systems */
+    {   "PCX",  ifPCX           },
+
+    {   "pcx",  ifPCX           },
+};
+
+
+
+/*****************************************************************************/
+/*                                   Code                                    */
+/*****************************************************************************/
+
+
+
+Bitmap* ReadInputFile (const char* Name, InputFormat Format)
+/* Read a bitmap from a file and return it. If Format is ifAuto, the routine
+ * tries to determine the format from the file name extension.
+ */
+{
+    /* If the format is Auto, try to determine it from the file name */
+    if (Format == ifAuto) {
+        /* Search for the entry in the table */
+        const FileId* F = GetFileId (Name, FormatTable,
+                                     sizeof (FormatTable) / sizeof (FormatTable[0]));
+        /* Found? */
+        if (F == 0) {
+            Error ("Cannot determine file format of input file `%s'", Name);
+        }
+        Format = F->Id;
+    }
+
+    /* Check the format just for safety */
+    CHECK (Format >= 0 && Format < ifCount);
+
+    /* Call the format specific read */
+    return InputFormatTable[Format].Read (Name);
+}
+
+
+

diff --git a/src/sp65/input.h b/src/sp65/input.h
new file mode 100644 (file)
index 0000000..0b019f7
--- /dev/null
+++ b/src/sp65/input.h
@@ -0,0 +1,81 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                  input.h                                  */
+/*                                                                           */
+/*   Input format/file definitions 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 INPUT_H
+#define INPUT_H
+
+
+
+/* sp65 */
+#include "bitmap.h"
+
+
+
+/*****************************************************************************/
+/*                                   Data                                    */
+/*****************************************************************************/
+
+
+
+typedef enum InputFormat InputFormat;
+enum InputFormat {
+    ifAuto      = -1,           /* Auto detect */
+    ifPCX,                      /* PCX */
+
+    ifCount                     /* Number of actual input formats w/o ifAuto*/
+};
+
+
+
+
+/*****************************************************************************/
+/*                                   Code                                    */
+/*****************************************************************************/
+
+
+
+Bitmap* ReadInputFile (const char* Name, InputFormat Format);
+/* Read a bitmap from a file and return it. If Format is ifAuto, the routine
+ * tries to determine the format from the file name extension.
+ */
+
+
+
+/* End of input.h */
+
+#endif
+
+
+

diff --git a/src/sp65/main.c b/src/sp65/main.c
index 1c57de983b8346d0481526da10a09714c67b5a63..0db9195156ba73f6741396b5e2d94f4c64b85f14 100644 (file)
--- a/src/sp65/main.c
+++ b/src/sp65/main.c
@@ -45,7 +45,7 @@
 
 /* sp65 */
 #include "error.h"
-#include "pcx.h"                /* ### Testing */
+#include "input.h"
 
 
 
@@ -153,7 +153,7 @@ int main (int argc, char* argv [])
            }
                } else {
            /* #### Testing */
-           ReadPCXFile (Arg);
+                   ReadInputFile (Arg, ifAuto);
        }
 
        /* Next argument */

diff --git a/src/sp65/make/gcc.mak b/src/sp65/make/gcc.mak
index ed3ebf31818a160d33c4ccc5e10a220ba3a3b61c..9c4a2b50abda4a05d78d46b6236da716855e3868 100644 (file)
--- a/src/sp65/make/gcc.mak
+++ b/src/sp65/make/gcc.mak
@@ -26,6 +26,7 @@ OBJS =        bitmap.o        \
         color.o         \
         error.o                \
         fileio.o        \
+        input.o         \
        main.o          \
         palette.o       \
         pcx.o

diff --git a/src/sp65/pcx.c b/src/sp65/pcx.c
index 5ce35b5fbb7623b2ba37c4b5e66c3d18f842a13d..22cabfedc9affc89f8bbe29f877c1e47c0798a54 100644 (file)
--- a/src/sp65/pcx.c
+++ b/src/sp65/pcx.c
@@ -272,6 +272,9 @@ Bitmap* ReadPCXFile (const char* Name)
         default:Internal ("Unexpected number of planes");
     }
 
+    /* Copy the name */
+    SB_CopyStr (&B->Name, Name);
+
     /* Remember the PCX header in the tag */
     B->Tag = P;