merge

12 files changed, 726 insertions, 10 deletions

diff --git a/ue2/imgsynth2/Makefile b/ue2/imgsynth2/Makefile
index 22e53e5..481230c 100644
--- a/ue2/imgsynth2/Makefile
+++ b/ue2/imgsynth2/Makefile
@@ -12,9 +12,11 @@ LIBS=		-L/usr/local/lib -lboost_program_options
 
 BIN=            imgsynth2
 OBJS=           cpixelformat_bgr24.o cpixelformat_bgr555.o \
-                cwindowsbitmap.o cbitmap.o cscriptparser.o imgsynth2.o
+                cpixelformat_indexed8.o cpixmap.o cwindowsbitmap.o \
+                cbitmap.o cscriptparser.o imgsynth2.o
 HEADERS=        cpixelformat.h cpixelformat_bgr24.h cpixelformat_bgr555.h \
-                cfile.h cbitmap.h cwindowsbitmap.h cscriptparser.h
+                cpixelformat_indexed8.h cpixmap.h cfile.h cbitmap.h \
+                cwindowsbitmap.h cscriptparser.h
 
 .SUFFIXES: .cpp .o
 
diff --git a/ue2/imgsynth2/cbitmap.cpp b/ue2/imgsynth2/cbitmap.cpp
index a064130..ed26600 100644
--- a/ue2/imgsynth2/cbitmap.cpp
+++ b/ue2/imgsynth2/cbitmap.cpp
@@ -28,9 +28,18 @@ CBitmap::~CBitmap()
   m_pixelformat = NULL;
 
   /* delete colortable content */
-  map<string, CPixelFormat::RGBPIXEL *>::iterator it2;
+  //TODO
+  /*map<string, CPixelFormat::RGBPIXEL *>::iterator it2;
   for (it2 = m_colortable.begin(); it2 != m_colortable.end(); it2++)
-    delete (*it2).second;
+    delete (*it2).second;*/
+
+  map<string, map<string,  uint32_t *> >::iterator it1;
+  map<string, uint32_t *>::iterator it2;
+  for(it1 = xpmColors.begin(); it1 != xpmColors.end(); it1++)
+  {
+    for(it2 = (*it1).second.begin(); it2 != (*it1).second.end(); it2++)
+      delete[] (*it2).second;
+  }
 }
 
 /*----------------------------------------------------------------------------*/
@@ -144,12 +153,13 @@ void CBitmap::invert(std::list<std::string> params)
   {
     /* invert every entry in the colortable */
     map<string, CPixelFormat::RGBPIXEL *>::iterator it;
-    for (it = m_colortable.begin(); it != m_colortable.end(); it++)
+    //TODO
+    /*for (it = m_colortable.begin(); it != m_colortable.end(); it++)
     {
       (*it).second->red   = max.red   - (*it).second->red;
       (*it).second->green = max.green - (*it).second->green;
       (*it).second->blue  = max.blue  - (*it).second->blue;
-    }
+    }*/
   }
   else
   {
@@ -213,12 +223,13 @@ void CBitmap::brightness(std::list<std::string> params)
   {
     /* invert every entry in the colortable */
     map<string, CPixelFormat::RGBPIXEL *>::iterator it;
-    for (it = m_colortable.begin(); it != m_colortable.end(); it++)
+    //TODO
+    /*for (it = m_colortable.begin(); it != m_colortable.end(); it++)
     {
       (*it).second->red   = min(max.red,   static_cast<uint32_t>((*it).second->red   * factor));
       (*it).second->green = min(max.green, static_cast<uint32_t>((*it).second->green * factor));
       (*it).second->blue  = min(max.blue,  static_cast<uint32_t>((*it).second->blue  * factor));
-    }
+    }*/
   }
   else
   {
diff --git a/ue2/imgsynth2/cbitmap.h b/ue2/imgsynth2/cbitmap.h
index df7dc84..c8d4dfb 100644
--- a/ue2/imgsynth2/cbitmap.h
+++ b/ue2/imgsynth2/cbitmap.h
@@ -231,7 +231,8 @@ class CBitmap : public CFile
     /** pointer to pixelbuffer */
     uint8_t *m_pixeldata;
     /** colortable map */
-    std::map<std::string, CPixelFormat::RGBPIXEL *> m_colortable;
+    //TODO std::map<std::string, CPixelFormat::RGBPIXEL *> m_colortable;
+    std::map<std::string, std::map< std::string, uint32_t* > > xpmColors;
     /** set of supported PixelFormat handlers */
     std::set<CPixelFormat *> m_handlers;
     /** pointer to CPixelFormat implementation */
diff --git a/ue2/imgsynth2/cpixelformat.h b/ue2/imgsynth2/cpixelformat.h
index a9e1e26..18d1a7d 100644
--- a/ue2/imgsynth2/cpixelformat.h
+++ b/ue2/imgsynth2/cpixelformat.h
@@ -13,7 +13,6 @@
 #include <stdexcept>
 
 class CBitmap;
-//#include "cbitmap.h"
 
 /**
  * @class CPixelFormat
diff --git a/ue2/imgsynth2/cpixelformat_indexed8.cpp b/ue2/imgsynth2/cpixelformat_indexed8.cpp
new file mode 100644
index 0000000..546daaf
--- /dev/null
+++ b/ue2/imgsynth2/cpixelformat_indexed8.cpp
@@ -0,0 +1,84 @@
+/**
+ * @module CPixelFormat_Indexed8
+ * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
+ * @brief  Implementation of CPixelFormat handling 24bit color Windows Bitmaps.
+ * @date   18.04.2009
+ */
+
+#include <boost/numeric/conversion/cast.hpp>
+#include "cpixelformat_indexed8.h"
+
+using namespace std;
+
+void CPixelFormat_Indexed8::getPixel(RGBPIXEL& pixel, uint32_t x, uint32_t y)
+{
+#if 0
+  if (m_bitmap->getPixelData() == NULL)
+    throw PixelFormatError("No pixelbuffer allocated.");
+
+  /* calc rowsize - boundary is 32 */
+  uint32_t rowsize = 4 * static_cast<uint32_t>(
+    ((getBitCount() * abs(m_bitmap->getInfoHeader().biWidth)) + 31) / 32
+  );*/
+
+  /* if height is positive the y-coordinates are mirrored */
+  if (m_bitmap->getInfoHeader().biHeight > 0)
+    y = m_bitmap->getInfoHeader().biHeight - y - 1;
+  uint32_t offset = y * rowsize + x * (4 * getBitCount() / 32);
+
+  /* boundary check */
+  if (offset + getBitCount()/8 > m_bitmap->getInfoHeader().biSizeImage)
+    throw PixelFormatError("Pixel position is out of range.");
+
+  /* get pixel */
+  try
+  {
+    pixel[0] = boost::numeric_cast<uint32_t>(*(m_bitmap->getPixelData() + offset + 2));
+    pixel[1] = boost::numeric_cast<uint32_t>(*(m_bitmap->getPixelData() + offset + 1));
+    pixel[2] = boost::numeric_cast<uint32_t>(*(m_bitmap->getPixelData() + offset));
+  }
+  catch(boost::numeric::bad_numeric_cast& ex)
+  {
+    throw PixelFormatError("Unable to convert pixelcolor to correct size: " + string(ex.what()));
+  }
+#endif
+}
+
+void CPixelFormat_Indexed8::setPixel(const RGBPIXEL& pixel, uint32_t x, uint32_t y)
+{
+#if 0
+ if (m_bitmap->getPixelData() == NULL)
+    throw PixelFormatError("No pixelbuffer allocated.");
+
+  /* calc rowsize - boundary is 32 */
+  uint32_t rowsize = 4 * static_cast<uint32_t>(
+    ((getBitCount() * abs(m_bitmap->getInfoHeader().biWidth)) + 31) / 32
+  );
+
+  /* if height is positive the y-coordinates are mirrored */
+  if (m_bitmap->getInfoHeader().biHeight > 0)
+    y = m_bitmap->getInfoHeader().biHeight - y - 1;
+  uint32_t offset = y * rowsize + x * (4 * getBitCount() / 32);
+
+  /* boundary check */
+  if (offset + getBitCount()/8 > m_bitmap->getInfoHeader().biSizeImage)
+    throw PixelFormatError("Pixel position is out of range.");
+
+  /* convert color values to correct types */
+  uint8_t data[3];
+  try
+  {
+    data[0] = boost::numeric_cast<uint8_t>(pixel[2]);
+    data[1] = boost::numeric_cast<uint8_t>(pixel[1]);
+    data[2] = boost::numeric_cast<uint8_t>(pixel[0]);
+  }
+  catch(boost::numeric::bad_numeric_cast& ex)
+  {
+    throw PixelFormatError("Unable to convert pixelcolor to correct size: " + string(ex.what()));
+  }
+
+  copy(data, data + 3, m_bitmap->getPixelData() + offset);
+#endif
+}
+
+/* vim: set et sw=2 ts=2: */
diff --git a/ue2/imgsynth2/cpixelformat_indexed8.h b/ue2/imgsynth2/cpixelformat_indexed8.h
new file mode 100644
index 0000000..2e2fc01
--- /dev/null
+++ b/ue2/imgsynth2/cpixelformat_indexed8.h
@@ -0,0 +1,121 @@
+/**
+ * @module cpixelformat_bgr24
+ * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
+ * @brief  Implementation of CPixelFormat handling 24bit color Windows Bitmaps.
+ * @date   18.04.2009
+ */
+
+#ifndef CPixelFormat_Indexed8_H
+#define CPixelFormat_Indexed8_H
+
+#include <fstream>
+#include "cpixelformat.h"
+#include "cpixmap.h"
+
+/**
+ * @class CPixelFormat_Indexed8
+ * @brief Implementation of CPixelFormat handling 24bit color Windows Bitmaps.
+ *
+ * On error CPixelFormat::PixelFormatError is thrown.
+ */
+class CPixelFormat_Indexed8 : public CPixelFormat
+{
+  public:
+    /**
+     * @method CPixelFormat_Indexed8
+     * @brief  Default ctor
+     * @param  bitmap pointer to CBitmap instance
+     * @return -
+     * @globalvars none
+     * @exception  none
+     * @conditions none
+     */
+    CPixelFormat_Indexed8(CPixmap *pixmap)
+      : CPixelFormat(pixmap)
+    {}
+
+    /**
+     * @method ~CPixelFormat_Indexed8
+     * @brief  Default dtor
+     * @param  -
+     * @return -
+     * @globalvars none
+     * @exception  none
+     * @conditions none
+     */
+    ~CPixelFormat_Indexed8()
+    {}
+
+    /**
+     * @method getPixel
+     * @brief  Get pixel at coordinates x, y
+     * @param  pixel reference to pixel data
+     * @param  x     x-coordinate
+     * @param  y     y-coordinate
+     * @return -
+     * @globalvars none
+     * @exception  PixelFormatError
+     * @conditions none
+     */
+    void getPixel(RGBPIXEL& pixel, uint32_t x, uint32_t y);
+
+    /**
+     * @method setPixel
+     * @brief  Modifies pixel at coordinates x, y
+     * @param  pixel reference to new pixel data
+     * @param  x     x-coordinate
+     * @param  y     y-coordinate
+     * @return -
+     * @globalvars none
+     * @exception  PixelFormatError
+     * @conditions none
+     */
+    void setPixel(const RGBPIXEL& pixel, uint32_t x, uint32_t y);
+
+    /**
+     * @method getBitCount
+     * @brief  returns the bitcount needed for indexing the color tabel.
+     * @param  -
+     * @return bitcount of indexes supported by this class
+     * @globalvars none
+     * @exception  none
+     * @conditions none
+     */
+    uint32_t getBitCount()
+    {
+      return 8;
+    }
+
+     /**
+     * @method getColorMode
+     * @brief  returns the color mode supported by this class
+     * @param  -
+     * @return color mode supported by this class
+     * @globalvars none
+     * @exception  none
+     * @conditions none
+     */
+    const std::string getColorMode()
+    {
+      return "c";
+    }
+
+    /**
+     * @method getMaxColor
+     * @brief  Get maximum values for RGB pixel
+     * @param  pixel reference to pixel struct
+     * @return -
+     * @globalvars none
+     * @exception  none
+     * @conditions none
+     */
+    void getMaxColor(RGBPIXEL& pixel)
+    {
+      /* value = 2^8 - 1 */
+      pixel.red = pixel.green = pixel.blue = 255;
+    }
+};
+
+#endif
+
+/* vim: set et sw=2 ts=2: */
diff --git a/ue2/imgsynth2/cpixmap.cpp b/ue2/imgsynth2/cpixmap.cpp
new file mode 100644
index 0000000..6f8c8d6
--- /dev/null
+++ b/ue2/imgsynth2/cpixmap.cpp
@@ -0,0 +1,269 @@
+/**
+ * @module CPixmap
+ * @author Guenther Neuwirth (0626638), Manuel Mausz (0728348)
+ * @brief  Implementation of CFile handling Windows Bitmaps.
+ * @date   27.04.2009
+ */
+
+#include <boost/lexical_cast.hpp>
+#include <boost/numeric/conversion/cast.hpp>
+
+#ifdef DEBUG
+# include <iostream>
+#endif
+#include <cstdlib>
+#include <stdint.h>
+# include <string>
+# include <map>
+
+
+
+#include "cpixmap.h"
+#include "cpixelformat_indexed8.h"
+
+using namespace std;
+
+CPixmap::CPixmap()
+{
+  m_types.insert("XPM");
+
+  /* add our handlers */
+  m_handlers.insert(new CPixelFormat_Indexed8(this));
+}
+
+/*----------------------------------------------------------------------------*/
+
+void CPixmap::read(std::ifstream& in)
+{
+
+  string str;
+  m_fileheader._XPMEXT = false;
+  m_fileheader._HOTSPOT = false;
+
+  /* parse the values section */
+  getline( in, str, '"');
+  getline( in, str, '"');
+  stringstream istr (str );
+
+  istr >> m_fileheader.xpmWidth ;
+  istr >> m_fileheader.xpmHeight ;
+  istr >> m_fileheader.nColor ;
+  istr >> m_fileheader.nChar ;
+
+  /*optional values */
+  if  (istr.good())
+  {
+    string tmp;
+    istr >> tmp;
+    if(tmp.compare("XPMEXT") == 0)
+      m_fileheader._XPMEXT = true;
+    else
+    {
+      m_fileheader._HOTSPOT = true;
+      m_fileheader.xHotspot = static_cast<unsigned int>(strtoul(tmp.c_str(), NULL, 16));
+      istr >> m_fileheader.yHotspot;
+    }
+    if (istr.good())
+    {
+      istr >> tmp;
+      if (tmp.compare("XPMEXT") == 0)
+        m_fileheader._XPMEXT = true;
+    }
+  }
+
+
+
+  /* parse color table*/
+  getline( in, str, '"');
+  string character, mode, colors;
+  for (unsigned int i = 0; i < m_fileheader.nColor; i++ )
+  {
+    getline( in, str, '"' );
+    stringstream istr2 (str );
+
+    istr2 >> character;
+    istr2 >> mode;
+    istr2 >> colors;
+
+    if ( colors.size() != 7)
+      throw FileError("Pixmap color tabel is invalid.");
+    if ( colors.at(0) != '#') 
+      throw FileError("Pixmap color tabel value is not hexadecimal.");
+
+    xpmColors[character][mode] = new (nothrow) unsigned int[3];
+    if (xpmColors[character][mode] == 0)
+       throw FileError("Bad color table allocation.");
+       
+    xpmColors[character][mode][0] = 
+      static_cast<unsigned int>(strtoul(colors.substr(1,2).c_str(), NULL, 16));
+    xpmColors[character][mode][1] =   
+      static_cast<unsigned int>(strtoul(colors.substr(3,2).c_str(), NULL, 16));
+    xpmColors[character][mode][2] = 
+      static_cast<unsigned int>(strtoul(colors.substr(5,2).c_str(), NULL, 16));
+    
+  
+   
+   
+
+    
+    getline( in, str, '"' );
+  }
+  
+  /* read pixel data using separate class */
+  if (getPixelDataSize() > 0)
+  {
+    if (m_pixeldata != NULL)
+      delete[] m_pixeldata;
+    m_pixeldata = new uint8_t[getPixelDataSize()];
+  
+    for (unsigned int y = 0; y <  getHeight(); y++ )
+    {
+      for (unsigned int x = 0; x <  getWidth(); x++ )
+        m_pixeldata[y * getWidth() + x] = static_cast<uint8_t>(in.get());
+
+      getline( in, str);
+      if ( y  != ( getHeight() - 1 ))
+        in.get();
+    
+    }
+  }
+
+  /* parse extension */
+  if ( m_fileheader._XPMEXT  )
+    getline( in, m_fileheader.extension, '}' );
+  /* debug*/
+  CPixmap::dump (cout);
+   
+  /* get pixelformat instance */
+  m_pixelformat = NULL;
+  set<CPixelFormat *>::iterator it;
+  for (it = m_handlers.begin(); it != m_handlers.end(); it++)
+  {
+    /* check color mode */
+    //TODO if (mode.compare((*it)->getColorMode()) == 0)
+    if (mode == "c")
+    {
+      m_pixelformat = *it;
+      break;
+    }
+  }
+  if (m_pixelformat == NULL)
+    throw FileError("Pixmap color mode \""+mode+"\" is not supported.");
+}
+
+/*----------------------------------------------------------------------------*/
+
+void CPixmap::write(std::ofstream& out, std::string& filename)
+{
+
+  /* header comment */
+  out<<"/* XPM */"<<endl;
+ 
+  /* variables*/
+  out<<"static char * "
+      <<filename.substr(filename.find_last_of("/\\") + 1, filename.size())
+      <<"[] = {"<<endl;
+  out<<"\""<<m_fileheader.xpmWidth<<" "<<m_fileheader.xpmHeight
+        <<" "<<m_fileheader.nColor<<" "<<m_fileheader.nChar;
+ 
+   /*optional values*/
+  if( m_fileheader._HOTSPOT )
+    out<<" "<<m_fileheader.xHotspot<<" "<<m_fileheader.yHotspot;
+  if( m_fileheader._XPMEXT )
+    out<<" "<<"XPMEXT";
+  out <<"\","<<endl;
+
+ /* color table */
+  map<string, map<string,  uint32_t* > >::iterator it1;
+  map<string, uint32_t* >::iterator it2;
+
+  for ( it1= xpmColors.begin() ; it1 != xpmColors.end(); it1++ )
+ {
+    out << "\""<<(*it1).first;
+    for ( it2=(*it1).second.begin() ; it2 != (*it1).second.end(); it2++ )
+    {
+      
+      out<<"\t" <<(*it2).first<<"\t#";
+      
+      for (int i = 0 ; i < 3; i++ )
+      {
+        out.width(2);
+        out << hex <<uppercase<<(*it2).second[i];
+        out.fill('0');
+      }
+    }
+    out<<"\","<<endl;
+  }
+  
+  /* pixel data */
+  for (unsigned int y = 0; y <  getHeight(); y++ ){
+  out <<"\"";
+    for (unsigned int x = 0; x <  getWidth(); x++ )
+      out << m_pixeldata[y * getWidth() + x];
+    out <<"\"";
+    if ( y  != ( getHeight() - 1 ))
+      out <<",";
+     out <<endl;
+  }
+  
+ /* extension */ 
+  if (m_fileheader._XPMEXT)
+    out << m_fileheader.extension;
+    
+  out <<"};";
+
+}
+
+
+/*----------------------------------------------------------------------------*/
+
+#ifdef DEBUG
+void CPixmap::dump(std::ostream& out)
+{
+
+  /* pixeldata */ 
+  cout<<endl<<"(_Pixel data:_)"<<endl;
+  for (unsigned int y = 0; y <  getHeight(); y++ ){
+    for (unsigned int x = 0; x <  getWidth(); x++ )
+      out << m_pixeldata[y * getWidth() + x];
+    out << endl;
+  }
+  
+  /* values*/
+  cout<<endl<<"(_Values:_)"<<endl;
+  out << "XPM  Header:" << endl
+    << "xpmWidth="  << m_fileheader.xpmWidth<< endl
+    << "xpmHeight=" << m_fileheader.xpmHeight<< endl
+    << "nColor=" << m_fileheader.nColor<< endl
+    << "nChar=" << m_fileheader.nChar<< endl
+    << "Hotspot=" << m_fileheader.xHotspot<< endl
+     << "yHotspot=" << m_fileheader.yHotspot<< endl
+     << "_HOTSPOT=" << m_fileheader._HOTSPOT<< endl
+    << "_XPMEXT=" << m_fileheader._XPMEXT<< endl
+     << "extension=" << m_fileheader.extension<< endl
+    << endl;
+
+  /* colors*/
+  map<string, map<string,  uint32_t* > >::iterator it1;
+  map<string, uint32_t* >::iterator it2;
+  cout<<"(_Color table:_)"<<endl;
+  for ( it1= xpmColors.begin() ; it1 != xpmColors.end(); it1++ )
+ {
+    out << (*it1).first;
+    for ( it2=(*it1).second.begin() ; it2 != (*it1).second.end(); it2++ )
+    {
+      out <<" "<< (*it2).first <<" ";
+      for (int i = 0 ; i < 3; i++ )
+      {
+        out.width(3);
+        out << (*it2).second[i]<<" ";
+        out.fill('0');
+      }
+      out<<endl;
+    }
+  }
+  
+}
+#endif
+
+/* vim: set et sw=2 ts=2: */
diff --git a/ue2/imgsynth2/cpixmap.h b/ue2/imgsynth2/cpixmap.h
new file mode 100644
index 0000000..eb219aa
--- /dev/null
+++ b/ue2/imgsynth2/cpixmap.h
@@ -0,0 +1,166 @@
+/**
+ * @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
+
+#include <stdint.h>
+#include "cbitmap.h"
+
+/**
+ * @class CPixmap
+ * @brief Implementation of CFile handling Pixmap file format.
+ *
+ * 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
+{
+  public:
+    /**
+     * @method CPixmap
+     * @brief  Default ctor
+     * @param  -
+     * @return -
+     * @globalvars none
+     * @exception  none
+     * @conditions none
+     */
+    CPixmap();
+
+    /**
+     * @method ~CPixmap
+     * @brief  Default dtor
+     * @param  -
+     * @return -
+     * @globalvars none
+     * @exception  none
+     * @conditions none
+     */
+    ~CPixmap()
+      {}
+
+    /**
+     * @method read
+     * @brief  Reads Pixmap from filestream.
+     *         On error an exception is thrown.
+     * @param  in filestream to read data from
+     * @return -
+     * @globalvars none
+     * @exception CFile::FileError
+     * @exception bad_alloc
+     * @conditions none
+     */
+    void read(std::ifstream& in);
+
+    /**
+     * @method write
+     * @brief  Writes Pixmap to filestream.
+     * @param  out filestream to read data from
+     * @return -
+     * @globalvars none
+     * @exception  FileError
+     * @exception  bad_alloc
+     * @conditions none
+     */
+    void write(std::ofstream& out, std::string& filename);
+
+#ifdef DEBUG
+    /**
+     * @method dump
+     * @brief  Dumps the Pixmap file header and pixel data to ostream
+     * @param  out output stream
+     * @return -
+     * @globalvars
+     * @exception
+     * @conditions
+     */
+    void dump(std::ostream& out);
+#endif
+
+    /**
+     * @brief Pixmap Header structure
+     */
+#pragma pack(push,1)
+    typedef struct
+    {
+     /** the xpm width in pixels (signed integer) */
+      uint32_t  xpmWidth;
+      /** the xpm height in pixels (signed integer) */
+      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;
+      /* 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 * m_fileheader.xpmHeight * 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;
+    }
+
+    /**
+     * @method hasColorTable
+     * @brief  Check if bitmap has a colortable
+     *         (we don't support this yet for windows bitmaps)
+     * @param  -
+     * @return true if bitmap has a colortable. false otherwise
+     * @globalvars none
+     * @exception  none
+     * @conditions none
+     */
+    const bool hasColorTable()
+    {
+      return true;
+    }
+
+    /* TODO */
+    const bool isMirrored()
+    {
+      /* pixmap is never mirrored */
+      return false;
+    }
+
+  protected:
+    /* members */
+    /** fileheader */
+    PIXMAP_FILEHEADER m_fileheader;
+    /** infoheader */
+};
+
+#endif
+
+/* vim: set et sw=2 ts=2: */
diff --git a/ue2/imgsynth2/cscriptparser.cpp b/ue2/imgsynth2/cscriptparser.cpp
index 46a7c42..17ff5a4 100644
--- a/ue2/imgsynth2/cscriptparser.cpp
+++ b/ue2/imgsynth2/cscriptparser.cpp
@@ -10,6 +10,7 @@
 #include <boost/algorithm/string.hpp>
 #include "cscriptparser.h"
 #include "cwindowsbitmap.h"
+#include "cpixmap.h"
 
 using namespace std;
 using namespace boost;
@@ -19,6 +20,7 @@ CScriptparser::CScriptparser(const std::string& scriptfile)
 {
   /* add our handlers */
   m_handlers.insert(new CWindowsBitmap);
+  m_handlers.insert(new CPixmap);
 }
 
 /*----------------------------------------------------------------------------*/
diff --git a/ue2/imgsynth2/test/input_yellow_man1_indexed8 b/ue2/imgsynth2/test/input_yellow_man1_indexed8
new file mode 100644
index 0000000..997cd4f
--- /dev/null
+++ b/ue2/imgsynth2/test/input_yellow_man1_indexed8
@@ -0,0 +1,10 @@
+#in: test/yellow_man1_xpm_in.xpm
+#out: test/yellow_man1_xpm_out.xpm
+#ref: test/yellow_man1_xpm_ref.xpm
+
+read(XPM, test/yellow_man1_indexed8_in.xpm)
+
+#fillrect(0,3,6,5,0,255,0)
+#fillrect(2,13,7,4,0,0,255)
+
+write(XPM, test/yellow_man1_indexed8_out.xpm)
diff --git a/ue2/imgsynth2/test/yellow_man1_indexed8_in.xpm b/ue2/imgsynth2/test/yellow_man1_indexed8_in.xpm
new file mode 100644
index 0000000..6e5fa2c
--- /dev/null
+++ b/ue2/imgsynth2/test/yellow_man1_indexed8_in.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * yellow_man1_default_xpm[] = {
+"9 17 2 1 0 0 XPMEXT",
+".      c #000000",
+"#      c #FFF200",
+".........",
+".........",
+"...###...",
+"...###...",
+"...###...",
+"....#....",
+"..#####..",
+".#.###.#.",
+".#.###.#.",
+".#.###.#.",
+".#.###.#.",
+"...#.#...",
+"...#.#...",
+"...#.#...",
+"...#.#...",
+".........",
+"........."
+"XPMEXT ext1 data1",
+"XPMEXT ext2",
+"data2_1",
+"data2_2",
+"XPMENDEXT"};
diff --git a/ue2/imgsynth2/test/yellow_man1_indexed8_ref.xpm b/ue2/imgsynth2/test/yellow_man1_indexed8_ref.xpm
new file mode 100644
index 0000000..57db73d
--- /dev/null
+++ b/ue2/imgsynth2/test/yellow_man1_indexed8_ref.xpm
@@ -0,0 +1,24 @@
+/* XPM */
+static char * yellow_man1_rgb24_ref_xpm[] = {
+"9 17 4 1",
+".      c #000000",
+"#      c #FFF200",
+"+      c #00FF00",
+"@      c #0000FF",
+".........",
+".........",
+"...###...",
+"++++++...",
+"++++++...",
+"++++++...",
+"++++++#..",
+"++++++.#.",
+".#.###.#.",
+".#.###.#.",
+".#.###.#.",
+"...#.#...",
+"...#.#...",
+"..@@@@@@@",
+"..@@@@@@@",
+"..@@@@@@@",
+"..@@@@@@@"};