From f8db8a3faa30b71dca33ced38be16d3f93f43e8a Mon Sep 17 00:00:00 2001 From: Rémi Verschelde Date: Sun, 19 Mar 2017 00:36:26 +0100 Subject: Bring that Whole New World to the Old Continent too Applies the clang-format style to the 2.1 branch as done for master in 5dbf1809c6e3e905b94b8764e99491e608122261. --- core/image_quantize.cpp | 223 +++++++++++++++++++++++------------------------- 1 file changed, 109 insertions(+), 114 deletions(-) (limited to 'core/image_quantize.cpp') diff --git a/core/image_quantize.cpp b/core/image_quantize.cpp index a594aee60..67b7cd518 100644 --- a/core/image_quantize.cpp +++ b/core/image_quantize.cpp @@ -27,41 +27,38 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "image.h" -#include #include "print_string.h" +#include #ifdef TOOLS_ENABLED +#include "os/os.h" #include "set.h" #include "sort.h" -#include "os/os.h" //#define QUANTIZE_SPEED_OVER_QUALITY - Image::MCBlock::MCBlock() { - - } -Image::MCBlock::MCBlock(BColorPos *p_colors,int p_color_count) { +Image::MCBlock::MCBlock(BColorPos *p_colors, int p_color_count) { - colors=p_colors; - color_count=p_color_count; - min_color.color=BColor(255,255,255,255); - max_color.color=BColor(0,0,0,0); + colors = p_colors; + color_count = p_color_count; + min_color.color = BColor(255, 255, 255, 255); + max_color.color = BColor(0, 0, 0, 0); shrink(); } int Image::MCBlock::get_longest_axis_index() const { - int max_dist=-1; - int max_index=0; + int max_dist = -1; + int max_index = 0; - for(int i=0;i<4;i++) { + for (int i = 0; i < 4; i++) { - int d = max_color.color.col[i]-min_color.color.col[i]; - if (d>max_dist) { - max_index=i; - max_dist=d; + int d = max_color.color.col[i] - min_color.color.col[i]; + if (d > max_dist) { + max_index = i; + max_dist = d; } } @@ -69,88 +66,80 @@ int Image::MCBlock::get_longest_axis_index() const { } int Image::MCBlock::get_longest_axis_length() const { - int max_dist=-1; + int max_dist = -1; - for(int i=0;i<4;i++) { + for (int i = 0; i < 4; i++) { - int d = max_color.color.col[i]-min_color.color.col[i]; - if (d>max_dist) { - max_dist=d; + int d = max_color.color.col[i] - min_color.color.col[i]; + if (d > max_dist) { + max_dist = d; } } return max_dist; } -bool Image::MCBlock::operator<(const MCBlock& p_block) const { +bool Image::MCBlock::operator<(const MCBlock &p_block) const { int alen = get_longest_axis_length(); int blen = p_block.get_longest_axis_length(); - if (alen==blen) { + if (alen == blen) { return colors < p_block.colors; } else return alen < blen; - } void Image::MCBlock::shrink() { - min_color=colors[0]; - max_color=colors[0]; + min_color = colors[0]; + max_color = colors[0]; - for(int i=1;ihas_environment("QUANTIZE_FAST"); + bool quantize_fast = OS::get_singleton()->has_environment("QUANTIZE_FAST"); convert(FORMAT_RGBA); - ERR_FAIL_COND( format!=FORMAT_RGBA ); + ERR_FAIL_COND(format != FORMAT_RGBA); DVector indexed_data; - { - int color_count = data.size()/4; + int color_count = data.size() / 4; - ERR_FAIL_COND(color_count==0); + ERR_FAIL_COND(color_count == 0); Set block_queue; DVector data_colors; data_colors.resize(color_count); - DVector::Write dcw=data_colors.write(); + DVector::Write dcw = data_colors.write(); DVector::Read dr = data.read(); - const BColor * drptr=(const BColor*)&dr[0]; - BColorPos *bcptr=&dcw[0]; - - + const BColor *drptr = (const BColor *)&dr[0]; + BColorPos *bcptr = &dcw[0]; { - for(int i=0;iget().color_count > 1 ) { + while (block_queue.size() < 256 && block_queue.back()->get().color_count > 1) { MCBlock longest = block_queue.back()->get(); //printf("longest: %i (%i)\n",longest.get_longest_axis_index(),longest.get_longest_axis_length()); @@ -173,7 +162,7 @@ void Image::quantize() { block_queue.erase(block_queue.back()); BColorPos *first = longest.colors; - BColorPos *median = longest.colors + (longest.color_count+1)/2; + BColorPos *median = longest.colors + (longest.color_count + 1) / 2; BColorPos *end = longest.colors + longest.color_count; #if 0 @@ -234,111 +223,122 @@ void Image::quantize() { block_queue.insert(right); #else - switch(longest.get_longest_axis_index()) { - case 0: { SortArray sort; sort.nth_element(0,end-first,median-first,first); } break; - case 1: { SortArray sort; sort.nth_element(0,end-first,median-first,first); } break; - case 2: { SortArray sort; sort.nth_element(0,end-first,median-first,first); } break; - case 3: { SortArray sort; sort.nth_element(0,end-first,median-first,first); } break; - + switch (longest.get_longest_axis_index()) { + case 0: { + SortArray sort; + sort.nth_element(0, end - first, median - first, first); + } break; + case 1: { + SortArray sort; + sort.nth_element(0, end - first, median - first, first); + } break; + case 2: { + SortArray sort; + sort.nth_element(0, end - first, median - first, first); + } break; + case 3: { + SortArray sort; + sort.nth_element(0, end - first, median - first, first); + } break; } - MCBlock left(first,median-first); - MCBlock right(median,end-median); + MCBlock left(first, median - first); + MCBlock right(median, end - median); block_queue.insert(left); block_queue.insert(right); - #endif - - } - while(block_queue.size() > 256) { + while (block_queue.size() > 256) { - block_queue.erase(block_queue.front());// erase least significant + block_queue.erase(block_queue.front()); // erase least significant } - int res_colors=0; + int res_colors = 0; - int comp_size = (has_alpha?4:3); - indexed_data.resize(color_count + 256*comp_size); + int comp_size = (has_alpha ? 4 : 3); + indexed_data.resize(color_count + 256 * comp_size); DVector::Write iw = indexed_data.write(); - uint8_t *iwptr=&iw[0]; + uint8_t *iwptr = &iw[0]; BColor pallete[256]; - // print_line("applying quantization - res colors "+itos(block_queue.size())); + // print_line("applying quantization - res colors "+itos(block_queue.size())); - while(block_queue.size()) { + while (block_queue.size()) { const MCBlock &b = block_queue.back()->get(); - uint64_t sum[4]={0,0,0,0}; + uint64_t sum[4] = { 0, 0, 0, 0 }; - for(int i=0;i