Started to add PCX routines.

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

diff --git a/src/sp65/bitmap.c b/src/sp65/bitmap.c
index c2daba5fa24cbc91652cdb4f6ad132bfc765a120..acf3f866633ed09c449a06388b20e883d18bc387 100644 (file)
--- a/src/sp65/bitmap.c
+++ b/src/sp65/bitmap.c
@@ -85,6 +85,18 @@ void FreeBitmap (Bitmap* B)
 
 
 
+int ValidBitmapSize (unsigned Width, unsigned Height)
+/* Return true if this is a valid size for a bitmap */
+{
+    /* Calculate the size of the bitmap in pixels */
+    unsigned long Size = (unsigned long) Width * Height;
+
+    /* Check the size */
+    return (Size > 0 && Size <= BM_MAX_SIZE);
+}
+
+
+
 Color GetPixelColor (const Bitmap* B, unsigned X, unsigned Y)
 /* Get the color for a given pixel. For indexed bitmaps, the palette entry
  * is returned.

diff --git a/src/sp65/bitmap.h b/src/sp65/bitmap.h
index 739f6454b9900bb037e03fd80ce1c95ae16c322f..9d0a967540313100765e49a856c5ba9a6935ee82 100644 (file)
--- a/src/sp65/bitmap.h
+++ b/src/sp65/bitmap.h
@@ -41,7 +41,7 @@
 /* common */
 #include "strbuf.h"
 
-/* sp65 */   
+/* sp65 */
 #include "palette.h"
 #include "pixel.h"
 
@@ -105,6 +105,9 @@ Bitmap* NewBitmap (unsigned Width, unsigned Height);
 void FreeBitmap (Bitmap* B);
 /* Free a dynamically allocated bitmap */
 
+int ValidBitmapSize (unsigned Width, unsigned Height);
+/* Return true if this is a valid size for a bitmap */
+
 Color GetPixelColor (const Bitmap* B, unsigned X, unsigned Y);
 /* Get the color for a given pixel. For indexed bitmaps, the palette entry
  * is returned.

diff --git a/src/sp65/main.c b/src/sp65/main.c
index c3a672290cfaa636a1df86958b1577ab4c0c10bc..66fb594b736bc460755b5e50148dede2890d0162 100644 (file)
--- a/src/sp65/main.c
+++ b/src/sp65/main.c
@@ -44,6 +44,7 @@
 
 /* sp65 */
 #include "error.h"
+#include "pcx.h"                /* ### Testing */
 
 
 
@@ -133,6 +134,9 @@ int main (int argc, char* argv [])
                    break;
 
            }
+               } else {
+           /* #### Testing */
+           ReadPCXFile (Arg);
        }
 
        /* Next argument */

diff --git a/src/sp65/make/gcc.mak b/src/sp65/make/gcc.mak
index c50b2621c0e49830a71e084ee81c0e74b5027696..94cb579c64290ddf788a9ebfb6b343ea4e407b15 100644 (file)
--- a/src/sp65/make/gcc.mak
+++ b/src/sp65/make/gcc.mak
@@ -26,7 +26,8 @@ OBJS =        bitmap.o        \
         error.o                \
         fileio.o        \
        main.o          \
-        palette.o
+        palette.o       \
+        pcx.o
 
 LIBS = $(COMMON)/common.a
 

diff --git a/src/sp65/pcx.c b/src/sp65/pcx.c
new file mode 100644 (file)
index 0000000..2ba0652
--- /dev/null
+++ b/src/sp65/pcx.c
@@ -0,0 +1,140 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                   pcx.c                                   */
+/*                                                                           */
+/*                              Read PCX files                               */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (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.                                                          */
+/*                                                                           */
+/*****************************************************************************/
+
+
+
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+/* sp65 */
+#include "error.h"
+#include "fileio.h"
+#include "pcx.h"
+
+
+
+/*****************************************************************************/
+/*                                  Macros                                   */
+/*****************************************************************************/
+
+
+
+/* Size of the PCX header and other constants */
+#define PCX_HEADER_SIZE         128
+#define PCX_MAGIC_ID            0x0A
+
+/* Type of a PCX header */
+typedef unsigned char           PCXHeader[PCX_HEADER_SIZE];
+
+/* The following macros are used to access the PCX header, which is a 128 byte
+ * block of raw data.
+ */
+#define WORD(H, O)              ((H)[O] | ((H)[O+1] << 8))
+#define PCX_ID(H)               ((H)[0])
+#define PCX_FILE_VERSION(H)     ((H)[1])
+#define PCX_COMPRESSION(H)      ((H)[2])
+#define PCX_BPP(H)              ((H)[3])
+#define PCX_XMIN(H)             WORD(H, 4)
+#define PCX_YMIN(H)             WORD(H, 6)
+#define PCX_XMAX(H)             WORD(H, 8)
+#define PCX_YMAX(H)             WORD(H, 10)
+#define PCX_PLANES(H)           ((H)[65])
+#define PCX_BYTES_PER_LINE(H)   WORD(H, 66)
+#define PCX_PAL_INFO(H)         WORD(H, 68)
+#define PCX_WIDTH(H)            WORD(H, 70)
+#define PCX_HEIGHT(H)           WORD(H, 72)
+
+
+
+/*****************************************************************************/
+/*                                   Code                                    */
+/*****************************************************************************/
+
+
+
+Bitmap* ReadPCXFile (const char* Name)
+/* Read a bitmap from a PCX file */
+{
+    PCXHeader H;
+    unsigned Version, Compression;
+    unsigned BPP, Planes, BytesPerLine;
+    unsigned Width, Height;
+    Bitmap* B;
+
+    /* Open the file */
+    FILE* F = fopen (Name, "rb");
+    if (F == 0) {
+        Error ("Cannot open PCX file `%s': %s", Name, strerror (errno));
+    }
+
+    /* Read the PCX header */
+    ReadData (F, H, sizeof (H));
+
+    /* Check the magic id byte */
+    if (PCX_ID (H) != PCX_MAGIC_ID) {
+        Error ("`%s' is not a PCX file", Name);
+    }
+
+    /* Read more data */
+    Version      = PCX_FILE_VERSION (H);
+    Compression  = PCX_COMPRESSION (H);
+    BPP          = PCX_BPP (H);
+    Planes       = PCX_PLANES (H);
+    BytesPerLine = PCX_BYTES_PER_LINE (H);
+    Width        = PCX_XMAX (H) - PCX_XMIN (H) + 1;
+    Height       = PCX_YMAX (H) - PCX_YMIN (H) + 1;
+
+    /* Check the data */
+    if (Compression != 0 && Compression != 1) {
+        Error ("Unsupported compression (%d) in PCX file `%s'",
+               Compression, Name);
+    }
+    if (BPP != 1 && BPP != 4 && BPP != 8) {
+        Error ("Unsupported bit depth (%d) in PCX file `%s'",
+               BPP, Name);
+    }
+    if (!ValidBitmapSize (Width, Height)) {
+        Error ("PCX file `%s' has an unsupported size (w=%u, h=%d)",
+               Name, Width, Height);
+    }
+
+    /* Close the file */
+    fclose (F);
+
+    /* Return the bitmap */
+    return B;
+}
+
+
+

diff --git a/src/sp65/pcx.h b/src/sp65/pcx.h
new file mode 100644 (file)
index 0000000..1a3870a
--- /dev/null
+++ b/src/sp65/pcx.h
@@ -0,0 +1,62 @@
+/*****************************************************************************/
+/*                                                                           */
+/*                                   pcx.h                                   */
+/*                                                                           */
+/*                              Read PCX files                               */
+/*                                                                           */
+/*                                                                           */
+/*                                                                           */
+/* (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 PCX_H
+#define PCX_H
+
+
+
+/* sp65 */
+#include "bitmap.h"
+
+
+
+/*****************************************************************************/
+/*                                   Code                                    */
+/*****************************************************************************/
+
+
+
+Bitmap* ReadPCXFile (const char* Name);
+/* Read a bitmap from a PCX file */
+
+
+
+/* End of pcx.h */
+
+#endif
+
+
+