1 files changed, 23 insertions, 20 deletions

diff --git a/ue2/imgsynth2/cpixelformat_bgr555.h b/ue2/imgsynth2/cpixelformat_bgr555.h
index 890b744..f131214 100644
--- a/ue2/imgsynth2/cpixelformat_bgr555.h
+++ b/ue2/imgsynth2/cpixelformat_bgr555.h
@@ -12,7 +12,7 @@
 #include <fstream>
 #include "cpixelformat.h"
 
-/* TODO */
+/* to (un-)pack pixel values */
 #define BGR555_RED_SHIFT    10
 #define BGR555_GREEN_SHIFT  5
 #define BGR555_BLUE_SHIFT   0
@@ -55,13 +55,23 @@ class CPixelFormat_BGR555 : public CPixelFormat
     ~CPixelFormat_BGR555()
     {}
 
-    /* TODO */
-    void getPixel(uint32_t *pixel, uint32_t x, uint32_t y);
+    /**
+     * @method getPixel
+     * @brief  Get pixel at coordinates x, y
+     * @param  pixel reference to pixel data
+     * @param  x     x-coordinate
+     * @param  y     y-coordinate
+     * @return -
+     * @globalvars none
+     * @exception  PixelFormatError
+     * @conditions none
+     */
+    void getPixel(RGBPIXEL& pixel, uint32_t x, uint32_t y);
 
     /**
      * @method setPixel
      * @brief  Modifies pixel at coordinates x, y
-     * @param  pixel pointer to new pixel data
+     * @param  pixel reference to new pixel data
      * @param  x     x-coordinate
      * @param  y     y-coordinate
      * @return -
@@ -69,7 +79,7 @@ class CPixelFormat_BGR555 : public CPixelFormat
      * @exception  PixelFormatError
      * @conditions none
      */
-    void setPixel(const uint32_t *pixel, uint32_t x, uint32_t y);
+    void setPixel(const RGBPIXEL& pixel, uint32_t x, uint32_t y);
 
     /**
      * @method getBitCount
@@ -85,26 +95,19 @@ class CPixelFormat_BGR555 : public CPixelFormat
       return 16;
     }
 
-      /**
-     * @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
      */
-    std::string getColorMode()
-    {
-      return "c";
-    }
-
-    /*
-     * TODO
-     */
-    void getMaxColor(unsigned int *red, unsigned int *green, unsigned int *blue)
+    void getMaxColor(RGBPIXEL& pixel)
     {
-      *red = *green = *blue = 31; /* 2^5 -1 */
+      /* value = 2^5 - 1 */
+      pixel.red = pixel.green = pixel.blue = 31;
     }
 };