rewrote pixmap::read to do more sanity checks

1 files changed, 2 insertions, 4 deletions

diff --git a/ue2/imgsynth2/cbitmap.h b/ue2/imgsynth2/cbitmap.h
index c8d4dfb..f48ada7 100644
--- a/ue2/imgsynth2/cbitmap.h
+++ b/ue2/imgsynth2/cbitmap.h
@@ -68,14 +68,13 @@ class CBitmap : public CFile
      * @method write
      * @brief  Writes Windows Bitmap to filestream.
      * @param  out      filestream to read data from
-     * @param  filename filename (maybe useful for some handlers)
      * @return -
      * @globalvars none
      * @exception  FileError
      * @exception  bad_alloc
      * @conditions none
      */
-    virtual void write(std::ofstream& out, std::string& filename) = 0;
+    virtual void write(std::ofstream& out) = 0;
 
     /**
      * @method getPixelData
@@ -231,8 +230,7 @@ class CBitmap : public CFile
     /** pointer to pixelbuffer */
     uint8_t *m_pixeldata;
     /** colortable map */
-    //TODO std::map<std::string, CPixelFormat::RGBPIXEL *> m_colortable;
-    std::map<std::string, std::map< std::string, uint32_t* > > xpmColors;
+    std::map<std::string, CPixelFormat::RGBPIXEL *> m_colortable;
     /** set of supported PixelFormat handlers */
     std::set<CPixelFormat *> m_handlers;
     /** pointer to CPixelFormat implementation */