Adding cpixelformat_indexd8.h and .cpp. Adding virtual methode getColorMode to CPixelFormat. Adding color table to CBitmap. Adding implementation of CPixmap

1 files changed, 29 insertions, 33 deletions

diff --git a/ue2/imgsynth2/cpixmap.h b/ue2/imgsynth2/cpixmap.h
index c7537cd..863cbd4 100644
--- a/ue2/imgsynth2/cpixmap.h
+++ b/ue2/imgsynth2/cpixmap.h
@@ -1,33 +1,32 @@
 /**
- * @module CPixMap
+ * @module CPixmap
  * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
  * @brief  Implementation of CFile CBitmap handling XPM.
  * @date   27.04.2009
  */
 
-#ifndef CPixMap_H
-#define CPixMap_H
+#ifndef CPixmap_H
+#define CPixmap_H
 
 #include <stdint.h>
-#include <map>
 #include "cbitmap.h"
 
 
 /**
- * @class CBitmap
- * @brief Implementation of CFile handling Windows Bitmaps.
+ * @class CPixmap
+ * @brief Implementation of CFile handling Pixmap file format.
  *
- * In order to support operations on bitmaps with different color bitcounts
- * different implementations of CPixelFormat are used. These classes are
- * allowed to modify the bitmap headers and pixelbuffer directly.
+ * In order to support operations on pixmaps in color mode an 
+ * implementations of CPixelFormat is used. These classe are
+ * allowed to modify the pixmap header, pixelbuffer and color table directly.
  *
  * On error CFile::FileError is thrown.
  */
-class CPixMap : public CBitmap
+class CPixmap : public CBitmap
 {
   public:
     /**
-     * @method CPixMap
+     * @method CPixmap
      * @brief  Default ctor
      * @param  -
      * @return -
@@ -35,10 +34,10 @@ class CPixMap : public CBitmap
      * @exception  none
      * @conditions none
      */
-    CPixMap();
+    CPixmap();
 
     /**
-     * @method ~CPixMap
+     * @method ~CPixmap
      * @brief  Default dtor
      * @param  -
      * @return -
@@ -46,12 +45,12 @@ class CPixMap : public CBitmap
      * @exception  none
      * @conditions none
      */
-    ~CPixMap()
+    ~CPixmap()
       {}
 
   /**
      * @method read
-     * @brief  Reads Windows Bitmap from filestream.
+     * @brief  Reads Pixmap from filestream.
      *         On error an exception is thrown.
      * @param  in filestream to read data from
      * @return -
@@ -64,7 +63,7 @@ class CPixMap : public CBitmap
 
     /**
      * @method write
-     * @brief  Writes Windows Bitmap to filestream.
+     * @brief  Writes Pixmap to filestream.
      * @param  out filestream to read data from
      * @return -
      * @globalvars none
@@ -73,11 +72,11 @@ class CPixMap : public CBitmap
      * @conditions none
      */
      
-    void write(std::ofstream& out);
+    void write(std::ofstream& out, std::string& filename);
 #ifdef DEBUG
     /**
      * @method dump
-     * @brief  Dumps the Windows Bitmap file headers to ostream
+     * @brief  Dumps the Pixmap file header and pixel data to ostream
      * @param  out output stream
      * @return -
      * @globalvars
@@ -90,7 +89,7 @@ class CPixMap : public CBitmap
  
 
     /**
-     * @brief Windows Bitmap Info Header structure
+     * @brief Pixmap Header structure
      */
 #pragma pack(push,1)
     typedef struct
@@ -101,25 +100,23 @@ class CPixMap : public CBitmap
       uint32_t  xpmHeight;
       /** the number of colors (signed integer) */
       uint32_t  nColor;
-     
       /** the number of characters per pixel (signed integer) */
       uint32_t  nChar;
-     
       /** X-Position Hotspots */
       uint32_t xHotspot;
- 
       /** Y-Position Hotspots */
       uint32_t yHotspot;
-      
-      /* color tables*/
-     //  std::map<std::string, std::map<  std::string,  std::string > > xpmColors;
-    //  std::map<std::string, uint32_t[3]> xpmColors;
-
-
-    } PIXMAP_FILEHEADER;
+      /* is hotspot set */
+      bool _HOTSPOT;
+      /* XPMEXT extension tag found*/
+      bool _XPMEXT;
+      /* unchanged extension */
+      std::string extension;
+   
+   } PIXMAP_FILEHEADER;
 #pragma pack(pop)
 
-   /* TODO */
+
     const uint32_t getPixelDataSize()
     {
       return m_fileheader.xpmWidth * 
@@ -127,21 +124,20 @@ class CPixMap : public CBitmap
                   m_fileheader.nChar;
     }
 
-    /* TODO */
+
     const uint32_t getHeight()
     {
       /* width and height can be negativ */
       return m_fileheader.xpmHeight;
     }
 
-    /* TODO */
     const uint32_t getWidth()
     {
       /* width and height can be negativ */
       return m_fileheader.xpmWidth;
     }
 
-    /* TODO */
+
     const bool isMirrored()
     {
       /* pixmap is never mirrored */