Commit 398cbeb6 authored by Jean-Paul Saman's avatar Jean-Paul Saman
Browse files

Scale every plane correctly. This fixes the "green bar at the bottom after scaling" issue.

parent c0da24fe
...@@ -160,12 +160,15 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -160,12 +160,15 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
uint8_t *p_dstendline = p_dst + i_dst_visible_pitch; uint8_t *p_dstendline = p_dst + i_dst_visible_pitch;
const uint8_t *p_dstend = p_dst + i_dst_visible_lines*i_dst_pitch; const uint8_t *p_dstend = p_dst + i_dst_visible_lines*i_dst_pitch;
int l = 1<<(SHIFT_SIZE-1); const int i_shift_height = i_dst_height / i_src_height;
const int i_shift_width = i_dst_width / i_src_width;
int l = 1<<(SHIFT_SIZE-i_shift_height);
for( ; p_dst < p_dstend; for( ; p_dst < p_dstend;
p_dst += i_dst_hidden_pitch, p_dst += i_dst_hidden_pitch,
p_dstendline += i_dst_pitch, l += i_height_coef ) p_dstendline += i_dst_pitch, l += i_height_coef )
{ {
int k = 1<<(SHIFT_SIZE-1); int k = 1<<(SHIFT_SIZE-i_shift_width);
uint8_t *p_srcl = p_src uint8_t *p_srcl = p_src
+ (__MIN( i_src_height_1, l >> SHIFT_SIZE )*i_src_pitch); + (__MIN( i_src_height_1, l >> SHIFT_SIZE )*i_src_pitch);
...@@ -201,13 +204,16 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) ...@@ -201,13 +204,16 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
uint32_t *p_dstendline = p_dst + (i_dst_visible_pitch>>2); uint32_t *p_dstendline = p_dst + (i_dst_visible_pitch>>2);
const uint32_t *p_dstend = p_dst + i_dst_visible_lines*(i_dst_pitch>>2); const uint32_t *p_dstend = p_dst + i_dst_visible_lines*(i_dst_pitch>>2);
int l = 1<<(SHIFT_SIZE-1); const int i_shift_height = i_dst_height / i_src_height;
const int i_shift_width = i_dst_width / i_src_width;
int l = 1<<(SHIFT_SIZE-i_shift_height);
for( ; p_dst < p_dstend; for( ; p_dst < p_dstend;
p_dst += (i_dst_hidden_pitch>>2), p_dst += (i_dst_hidden_pitch>>2),
p_dstendline += (i_dst_pitch>>2), p_dstendline += (i_dst_pitch>>2),
l += i_height_coef ) l += i_height_coef )
{ {
int k = 1<<(SHIFT_SIZE-1); int k = 1<<(SHIFT_SIZE-i_shift_width);
uint32_t *p_srcl = p_src uint32_t *p_srcl = p_src
+ (__MIN( i_src_height_1, l >> SHIFT_SIZE )*(i_src_pitch>>2)); + (__MIN( i_src_height_1, l >> SHIFT_SIZE )*(i_src_pitch>>2));
for( ; p_dst < p_dstendline; p_dst++, k += i_width_coef ) for( ; p_dst < p_dstendline; p_dst++, k += i_width_coef )
......
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