Commit a05c1914 authored by Davis King's avatar Davis King

Fixed error in pyramid_down<2> that caused the output image to be a little

funny looking in some cases.
parent cc5d16d2
...@@ -319,8 +319,8 @@ namespace dlib ...@@ -319,8 +319,8 @@ namespace dlib
ptype temp = temp_img[r-2][c] + ptype temp = temp_img[r-2][c] +
temp_img[r-1][c]*4 + temp_img[r-1][c]*4 +
temp_img[r ][c]*6 + temp_img[r ][c]*6 +
temp_img[r-1][c]*4 + temp_img[r+1][c]*4 +
temp_img[r-2][c]; temp_img[r+2][c];
assign_pixel(down[dr][c],temp/256); assign_pixel(down[dr][c],temp/256);
} }
...@@ -443,18 +443,18 @@ namespace dlib ...@@ -443,18 +443,18 @@ namespace dlib
temp.red = temp_img[r-2][c].red + temp.red = temp_img[r-2][c].red +
temp_img[r-1][c].red*4 + temp_img[r-1][c].red*4 +
temp_img[r ][c].red*6 + temp_img[r ][c].red*6 +
temp_img[r-1][c].red*4 + temp_img[r+1][c].red*4 +
temp_img[r-2][c].red; temp_img[r+2][c].red;
temp.green = temp_img[r-2][c].green + temp.green = temp_img[r-2][c].green +
temp_img[r-1][c].green*4 + temp_img[r-1][c].green*4 +
temp_img[r ][c].green*6 + temp_img[r ][c].green*6 +
temp_img[r-1][c].green*4 + temp_img[r+1][c].green*4 +
temp_img[r-2][c].green; temp_img[r+2][c].green;
temp.blue = temp_img[r-2][c].blue + temp.blue = temp_img[r-2][c].blue +
temp_img[r-1][c].blue*4 + temp_img[r-1][c].blue*4 +
temp_img[r ][c].blue*6 + temp_img[r ][c].blue*6 +
temp_img[r-1][c].blue*4 + temp_img[r+1][c].blue*4 +
temp_img[r-2][c].blue; temp_img[r+2][c].blue;
down[dr][c].red = temp.red/256; down[dr][c].red = temp.red/256;
down[dr][c].green = temp.green/256; down[dr][c].green = temp.green/256;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment