Corrected issue with color conversion

Author: drojaazu

CMakeLists.txt

@@ -14,7 +14,7 @@ set(CMAKE_CXX_COMPILER_NAMES clang++ g++ icpc c++ cxx)
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
 
 # chrgfx library
-project(chrgfx VERSION 2.0.1 LANGUAGES CXX)
+project(chrgfx VERSION 2.0.2 LANGUAGES CXX)
 add_subdirectory(chrgfx)
 
 # conversion executables

chrgfx/inc/utils.hpp

@@ -16,15 +16,15 @@ namespace chrgfx
  * @param data color channel data
  * @param bitcount target bitdepth
  */
-byte_t reduce_bitdepth(byte_t data, u8 bitdepth);
+u8 reduce_bitdepth(u8 data, u8 bitdepth);
 
 /**
  * @brief Increase bitdepth of a color channel to 8 bits
  *
  * @param data color channel data
  * @param bitdepth bitdepth of the input channel
  */
-byte_t expand_bitdepth(byte_t data, u8 bitdepth);
+u8 expand_bitdepth(u8 data, u8 bitdepth);
 
 /**
  * @brief Returns an 32 bit value with the specified number of bits set

chrgfx/src/app.hpp

@@ -7,8 +7,8 @@
 namespace APP {
 	static unsigned int const VERSION_MAJOR{2};
 	static unsigned int const VERSION_MINOR{0};
-	static unsigned int const VERSION_PATCH{1};
-	static char const * VERSION{"2.0.1"};
+	static unsigned int const VERSION_PATCH{2};
+	static char const * VERSION{"2.0.2"};
 
 	static char const * NAME{"chrgfx"};
 	static char const * CONTACT{"Damian R (damian@motoi.pro)"};

chrgfx/src/colconv.cpp

@@ -28,7 +28,7 @@ u32 encode_col(rgbcoldef const & rgbcoldef, color const & color)
 
 	u32 out { 0 };
 	u8 bitdepth = rgbcoldef.bitdepth();
-	byte_t red { reduce_bitdepth(color.red, bitdepth) }, red_pass_shift { 0 },
+	u8 red { reduce_bitdepth(color.red, bitdepth) }, red_pass_shift { 0 },
 			green { reduce_bitdepth(color.green, bitdepth) }, green_pass_shift { 0 },
 			blue { reduce_bitdepth(color.blue, bitdepth) }, blue_pass_shift { 0 };
 

chrgfx/src/utils.cpp

@@ -3,7 +3,7 @@
 namespace chrgfx
 {
 
-byte_t reduce_bitdepth(byte_t data, u8 bitdepth)
+u8 reduce_bitdepth(u8 data, u8 bitdepth)
 {
 	// convert color bit depths algo:
 	// (bitdepth_a_value * bitdepth_b_max) / bitdepth_a_max = bitdepth_b_value
@@ -12,7 +12,7 @@ byte_t reduce_bitdepth(byte_t data, u8 bitdepth)
 	return (data * (create_bitmask8(bitdepth) + 1)) / 256;
 }
 
-byte_t expand_bitdepth(byte_t data, u8 bitdepth)
+u8 expand_bitdepth(u8 data, u8 bitdepth)
 {
 	// shamelessly stolen from MAME
 	if(bitdepth == 1)
@@ -124,7 +124,6 @@ palette make_pal_random()
 	return outpal;
 }
 
-
 bool is_system_bigendian()
 {
 	// shamelessly stolen from stack overflow