1 files changed, 13 insertions, 16 deletions

diff --git a/ue2/imgsynth2/cpixmap.cpp b/ue2/imgsynth2/cpixmap.cpp
index 91419b6..6f8c8d6 100644
--- a/ue2/imgsynth2/cpixmap.cpp
+++ b/ue2/imgsynth2/cpixmap.cpp
@@ -29,30 +29,27 @@ CPixmap::CPixmap()
 
   /* 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())
   {
@@ -63,8 +60,7 @@ void CPixmap::read(std::ifstream& in)
     else
     {
       m_fileheader._HOTSPOT = true;
-      m_fileheader.xHotspot =  
-      static_cast<unsigned int>(strtoul(tmp.c_str(), NULL, 16));
+      m_fileheader.xHotspot = static_cast<unsigned int>(strtoul(tmp.c_str(), NULL, 16));
       istr >> m_fileheader.yHotspot;
     }
     if (istr.good())
@@ -74,9 +70,9 @@ void CPixmap::read(std::ifstream& in)
         m_fileheader._XPMEXT = true;
     }
   }
- 
-    
-  
+
+
+
   /* parse color table*/
   getline( in, str, '"');
   string character, mode, colors;
@@ -84,16 +80,16 @@ void CPixmap::read(std::ifstream& in)
   {
     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.");
@@ -144,7 +140,8 @@ void CPixmap::read(std::ifstream& in)
   for (it = m_handlers.begin(); it != m_handlers.end(); it++)
   {
     /* check color mode */
-    if (mode.compare((*it)->getColorMode()) == 0)
+    //TODO if (mode.compare((*it)->getColorMode()) == 0)
+    if (mode == "c")
     {
       m_pixelformat = *it;
       break;