merge

1 files changed, 2 insertions, 1 deletions

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 */