Moved a lot of stuff around to get abstract cbitmap working

1 files changed, 11 insertions, 10 deletions

diff --git a/ue2/imgsynth2/cpixelformat_bgr24.cpp b/ue2/imgsynth2/cpixelformat_bgr24.cpp
index cc02dcc..4567ce6 100644
--- a/ue2/imgsynth2/cpixelformat_bgr24.cpp
+++ b/ue2/imgsynth2/cpixelformat_bgr24.cpp
@@ -10,6 +10,7 @@
 
 using namespace std;
 
+/* TODO */
 void CPixelFormat_BGR24::getPixel(uint32_t *pixel, uint32_t x, uint32_t y)
 {
   /*
@@ -22,16 +23,16 @@ void CPixelFormat_BGR24::getPixel(uint32_t *pixel, uint32_t x, uint32_t y)
 
   /* calc rowsize - boundary is 32 */
   uint32_t rowsize = 4 * static_cast<uint32_t>(
-    ((getBitCount() * abs(m_bitmap->getInfoHeader().biWidth)) + 31) / 32
+    ((getBitCount() * m_bitmap->getWidth()) + 31) / 32
   );
 
-  /* if height is positive the y-coordinates are mirrored */
-  if (m_bitmap->getInfoHeader().biHeight > 0)
-    y = m_bitmap->getInfoHeader().biHeight - y - 1;
+  /* if the y-coordinates are mirrored */
+  if (m_bitmap->isMirrored())
+    y = m_bitmap->getHeight() - 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->getPixelDataSize())
     throw PixelFormatError("Pixel position is out of range.");
 
   /* get pixel */
@@ -59,16 +60,16 @@ void CPixelFormat_BGR24::setPixel(const uint32_t *pixel, uint32_t x, uint32_t y)
 
   /* calc rowsize - boundary is 32 */
   uint32_t rowsize = 4 * static_cast<uint32_t>(
-    ((getBitCount() * abs(m_bitmap->getInfoHeader().biWidth)) + 31) / 32
+    ((getBitCount() * m_bitmap->getWidth()) + 31) / 32
   );
 
-  /* if height is positive the y-coordinates are mirrored */
-  if (m_bitmap->getInfoHeader().biHeight > 0)
-    y = m_bitmap->getInfoHeader().biHeight - y - 1;
+  /* if the y-coordinates are mirrored */
+  if (m_bitmap->isMirrored())
+    y = m_bitmap->getHeight() - 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->getPixelDataSize())
     throw PixelFormatError("Pixel position is out of range.");
 
   /* convert color values to correct types */