1 files changed, 19 insertions, 25 deletions

diff --git a/ue2/imgsynth2/cpixelformat_indexed8.cpp b/ue2/imgsynth2/cpixelformat_indexed8.cpp
index c62a1ba..546daaf 100644
--- a/ue2/imgsynth2/cpixelformat_indexed8.cpp
+++ b/ue2/imgsynth2/cpixelformat_indexed8.cpp
@@ -10,32 +10,28 @@
 
 using namespace std;
 
-void CPixelFormat_Indexed8::getPixel(uint32_t *pixel, uint32_t x, uint32_t y)
+void CPixelFormat_Indexed8::getPixel(RGBPIXEL& pixel, uint32_t x, uint32_t y)
 {
-  /*
-   * pixel[0] ... red
-   * pixel[1] ... green
-   * pixel[2] ... blue
-   */
- // if (m_bitmap->getPixelData() == NULL)
-   // throw PixelFormatError("No pixelbuffer allocated.");
+#if 0
+  if (m_bitmap->getPixelData() == NULL)
+    throw PixelFormatError("No pixelbuffer allocated.");
 
   /* calc rowsize - boundary is 32 */
- /* uint32_t rowsize = 4 * static_cast<uint32_t>(
+  uint32_t rowsize = 4 * static_cast<uint32_t>(
     ((getBitCount() * abs(m_bitmap->getInfoHeader().biWidth)) + 31) / 32
   );*/
 
   /* if height is positive the y-coordinates are mirrored */
- /* if (m_bitmap->getInfoHeader().biHeight > 0)
+  if (m_bitmap->getInfoHeader().biHeight > 0)
     y = m_bitmap->getInfoHeader().biHeight - y - 1;
   uint32_t offset = y * rowsize + x * (4 * getBitCount() / 32);
 
   /* boundary check */
- /* if (offset + getBitCount()/8 > m_bitmap->getInfoHeader().biSizeImage)
+  if (offset + getBitCount()/8 > m_bitmap->getInfoHeader().biSizeImage)
     throw PixelFormatError("Pixel position is out of range.");
 
   /* get pixel */
-/*  try
+  try
   {
     pixel[0] = boost::numeric_cast<uint32_t>(*(m_bitmap->getPixelData() + offset + 2));
     pixel[1] = boost::numeric_cast<uint32_t>(*(m_bitmap->getPixelData() + offset + 1));
@@ -44,35 +40,32 @@ void CPixelFormat_Indexed8::getPixel(uint32_t *pixel, uint32_t x, uint32_t y)
   catch(boost::numeric::bad_numeric_cast& ex)
   {
     throw PixelFormatError("Unable to convert pixelcolor to correct size: " + string(ex.what()));
-  }*/
+  }
+#endif
 }
 
-void CPixelFormat_Indexed8::setPixel(const uint32_t *pixel, uint32_t x, uint32_t y)
+void CPixelFormat_Indexed8::setPixel(const RGBPIXEL& pixel, uint32_t x, uint32_t y)
 {
-  /*
-   * pixel[0] ... red
-   * pixel[1] ... green
-   * pixel[2] ... blue
-   */
-/* if (m_bitmap->getPixelData() == NULL)
+#if 0
+ if (m_bitmap->getPixelData() == NULL)
     throw PixelFormatError("No pixelbuffer allocated.");
 
   /* calc rowsize - boundary is 32 */
- /* uint32_t rowsize = 4 * static_cast<uint32_t>(
+  uint32_t rowsize = 4 * static_cast<uint32_t>(
     ((getBitCount() * abs(m_bitmap->getInfoHeader().biWidth)) + 31) / 32
   );
 
   /* if height is positive the y-coordinates are mirrored */
- /* if (m_bitmap->getInfoHeader().biHeight > 0)
+  if (m_bitmap->getInfoHeader().biHeight > 0)
     y = m_bitmap->getInfoHeader().biHeight - y - 1;
   uint32_t offset = y * rowsize + x * (4 * getBitCount() / 32);
 
   /* boundary check */
- /* if (offset + getBitCount()/8 > m_bitmap->getInfoHeader().biSizeImage)
+  if (offset + getBitCount()/8 > m_bitmap->getInfoHeader().biSizeImage)
     throw PixelFormatError("Pixel position is out of range.");
 
   /* convert color values to correct types */
-  /*uint8_t data[3];
+  uint8_t data[3];
   try
   {
     data[0] = boost::numeric_cast<uint8_t>(pixel[2]);
@@ -85,6 +78,7 @@ void CPixelFormat_Indexed8::setPixel(const uint32_t *pixel, uint32_t x, uint32_t
   }
 
   copy(data, data + 3, m_bitmap->getPixelData() + offset);
-*/}
+#endif
+}
 
 /* vim: set et sw=2 ts=2: */