- colortable now uses uint32_t as identifier

- rewrote xpm colortable parsing to convert their identifiers to our own and vica vi
- implemented indexed8::setpixel/getpixel
- moved rowsize to member variable in cbitmap
- added second test for xpm/indexed8

1 files changed, 5 insertions, 0 deletions

diff --git a/ue2/imgsynth2/cwindowsbitmap.cpp b/ue2/imgsynth2/cwindowsbitmap.cpp
index ddacab9..d561465 100644
--- a/ue2/imgsynth2/cwindowsbitmap.cpp
+++ b/ue2/imgsynth2/cwindowsbitmap.cpp
@@ -75,6 +75,11 @@ void CWindowsBitmap::read(std::ifstream& in)
   }
   if (m_pixelformat == NULL)
     throw FileError("Bitmap bitcount is not supported.");
+
+  /* calc rowsize - boundary is 32 */
+  m_rowsize = 4 * static_cast<uint32_t>(
+    ((m_pixelformat->getBitCount() * m_infoheader.biWidth) + 31) / 32
+  );
 }
 
 /*----------------------------------------------------------------------------*/