merge

1 files changed, 17 insertions, 6 deletions

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
   {