1 files changed, 27 insertions, 20 deletions

diff --git a/ue2/imgsynth2/cpixelformat.h b/ue2/imgsynth2/cpixelformat.h
index 2300f2f..18d1a7d 100644
--- a/ue2/imgsynth2/cpixelformat.h
+++ b/ue2/imgsynth2/cpixelformat.h
@@ -10,11 +10,9 @@
 #define CPIXELFORMAT_H
 
 #include <fstream>
-#include <string>
 #include <stdexcept>
 
 class CBitmap;
-#include "cbitmap.h"
 
 /**
  * @class CPixelFormat
@@ -73,9 +71,22 @@ class CPixelFormat
     {};
 
     /**
-     * @method setPixel
-     * @brief  Modifies pixel at coordinates x, y
-     * @param  pixel pointer to new pixel data
+     * @brief RGB Pixel structure
+     */
+    typedef struct
+    {
+      /** red */
+      uint32_t red;
+      /** green */
+      uint32_t green;
+      /** blue */
+      uint32_t blue;
+    } RGBPIXEL;
+
+    /**
+     * @method getPixel
+     * @brief  Get pixel at coordinates x, y
+     * @param  pixel reference to pixel data
      * @param  x     x-coordinate
      * @param  y     y-coordinate
      * @return -
@@ -83,12 +94,12 @@ class CPixelFormat
      * @exception  PixelFormatError
      * @conditions none
      */
-    virtual void setPixel(const uint32_t *pixel, const uint32_t x, const uint32_t y) = 0;
+    virtual void getPixel(RGBPIXEL& pixel, const uint32_t x, const uint32_t y) = 0;
 
     /**
-     * @method getPixel
-     * @brief  Get pixel at coordinates x, y
-     * @param  pixel pointer to pixel data
+     * @method setPixel
+     * @brief  Modifies pixel at coordinates x, y
+     * @param  pixel reference to new pixel data
      * @param  x     x-coordinate
      * @param  y     y-coordinate
      * @return -
@@ -96,7 +107,7 @@ class CPixelFormat
      * @exception  PixelFormatError
      * @conditions none
      */
-    virtual void getPixel(uint32_t *pixel, const uint32_t x, const uint32_t y) = 0;
+    virtual void setPixel(const RGBPIXEL& pixel, const uint32_t x, const uint32_t y) = 0;
 
     /**
      * @method getBitCount
@@ -109,20 +120,16 @@ class CPixelFormat
      */
     virtual uint32_t getBitCount() = 0;
 
-     /**
-     * @method getColorMode
-     * @brief  returns the color mode supported by this class
-     * @param  -
-     * @return color mode supported by this class
+    /**
+     * @method getMaxColor
+     * @brief  Get maximum values for RGB pixel
+     * @param  pixel reference to pixel struct
+     * @return -
      * @globalvars none
      * @exception  none
      * @conditions none
      */
-    virtual std::string getColorMode() = 0;
-    /*
-     * TODO
-     */
-    virtual void getMaxColor(unsigned int *red, unsigned int *green, unsigned int *blue) = 0;
+    virtual void getMaxColor(RGBPIXEL& pixel) = 0;
 
   protected:
     /* members */