gdi32: Avoid binary ROPs when stretching in DELETESCANS mode.

This commit is contained in:
Alexandre Julliard 2012-12-03 17:32:59 +01:00
parent 8e65485732
commit 6f6e919e2b
1 changed files with 112 additions and 38 deletions

View File

@ -5697,19 +5697,37 @@ static void stretch_row_32(const dib_info *dst_dib, const POINT *dst_start,
DWORD *src_ptr = get_pixel_ptr_32( src_dib, src_start->x, src_start->y ); DWORD *src_ptr = get_pixel_ptr_32( src_dib, src_start->x, src_start->y );
int err = params->err_start; int err = params->err_start;
int width; int width;
struct rop_codes codes;
rop_codes_from_stretch_mode( mode, &codes ); if (mode == STRETCH_DELETESCANS)
for (width = params->length; width; width--)
{ {
do_rop_codes_32( dst_ptr, *src_ptr, &codes ); for (width = params->length; width; width--)
dst_ptr += params->dst_inc;
if (err > 0)
{ {
src_ptr += params->src_inc; *dst_ptr = *src_ptr;
err += params->err_add_1; dst_ptr += params->dst_inc;
if (err > 0)
{
src_ptr += params->src_inc;
err += params->err_add_1;
}
else err += params->err_add_2;
}
}
else
{
struct rop_codes codes;
rop_codes_from_stretch_mode( mode, &codes );
for (width = params->length; width; width--)
{
do_rop_codes_32( dst_ptr, *src_ptr, &codes );
dst_ptr += params->dst_inc;
if (err > 0)
{
src_ptr += params->src_inc;
err += params->err_add_1;
}
else err += params->err_add_2;
} }
else err += params->err_add_2;
} }
} }
@ -5722,21 +5740,41 @@ static void stretch_row_24(const dib_info *dst_dib, const POINT *dst_start,
BYTE *src_ptr = get_pixel_ptr_24( src_dib, src_start->x, src_start->y ); BYTE *src_ptr = get_pixel_ptr_24( src_dib, src_start->x, src_start->y );
int err = params->err_start; int err = params->err_start;
int width; int width;
struct rop_codes codes;
rop_codes_from_stretch_mode( mode, &codes ); if (mode == STRETCH_DELETESCANS)
for (width = params->length; width; width--)
{ {
do_rop_codes_8( dst_ptr, *src_ptr, &codes ); for (width = params->length; width; width--)
do_rop_codes_8( dst_ptr + 1, *(src_ptr + 1), &codes );
do_rop_codes_8( dst_ptr + 2, *(src_ptr + 2), &codes );
dst_ptr += 3 * params->dst_inc;
if (err > 0)
{ {
src_ptr += 3 * params->src_inc; dst_ptr[0] = src_ptr[0];
err += params->err_add_1; dst_ptr[1] = src_ptr[1];
dst_ptr[2] = src_ptr[2];
dst_ptr += 3 * params->dst_inc;
if (err > 0)
{
src_ptr += 3 * params->src_inc;
err += params->err_add_1;
}
else err += params->err_add_2;
}
}
else
{
struct rop_codes codes;
rop_codes_from_stretch_mode( mode, &codes );
for (width = params->length; width; width--)
{
do_rop_codes_8( dst_ptr, *src_ptr, &codes );
do_rop_codes_8( dst_ptr + 1, *(src_ptr + 1), &codes );
do_rop_codes_8( dst_ptr + 2, *(src_ptr + 2), &codes );
dst_ptr += 3 * params->dst_inc;
if (err > 0)
{
src_ptr += 3 * params->src_inc;
err += params->err_add_1;
}
else err += params->err_add_2;
} }
else err += params->err_add_2;
} }
} }
@ -5749,19 +5787,37 @@ static void stretch_row_16(const dib_info *dst_dib, const POINT *dst_start,
WORD *src_ptr = get_pixel_ptr_16( src_dib, src_start->x, src_start->y ); WORD *src_ptr = get_pixel_ptr_16( src_dib, src_start->x, src_start->y );
int err = params->err_start; int err = params->err_start;
int width; int width;
struct rop_codes codes;
rop_codes_from_stretch_mode( mode, &codes ); if (mode == STRETCH_DELETESCANS)
for (width = params->length; width; width--)
{ {
do_rop_codes_16( dst_ptr, *src_ptr, &codes ); for (width = params->length; width; width--)
dst_ptr += params->dst_inc;
if (err > 0)
{ {
src_ptr += params->src_inc; *dst_ptr = *src_ptr;
err += params->err_add_1; dst_ptr += params->dst_inc;
if (err > 0)
{
src_ptr += params->src_inc;
err += params->err_add_1;
}
else err += params->err_add_2;
}
}
else
{
struct rop_codes codes;
rop_codes_from_stretch_mode( mode, &codes );
for (width = params->length; width; width--)
{
do_rop_codes_16( dst_ptr, *src_ptr, &codes );
dst_ptr += params->dst_inc;
if (err > 0)
{
src_ptr += params->src_inc;
err += params->err_add_1;
}
else err += params->err_add_2;
} }
else err += params->err_add_2;
} }
} }
@ -5774,19 +5830,37 @@ static void stretch_row_8(const dib_info *dst_dib, const POINT *dst_start,
BYTE *src_ptr = get_pixel_ptr_8( src_dib, src_start->x, src_start->y ); BYTE *src_ptr = get_pixel_ptr_8( src_dib, src_start->x, src_start->y );
int err = params->err_start; int err = params->err_start;
int width; int width;
struct rop_codes codes;
rop_codes_from_stretch_mode( mode, &codes ); if (mode == STRETCH_DELETESCANS)
for (width = params->length; width; width--)
{ {
do_rop_codes_8( dst_ptr, *src_ptr, &codes ); for (width = params->length; width; width--)
dst_ptr += params->dst_inc;
if (err > 0)
{ {
src_ptr += params->src_inc; *dst_ptr = *src_ptr;
err += params->err_add_1; dst_ptr += params->dst_inc;
if (err > 0)
{
src_ptr += params->src_inc;
err += params->err_add_1;
}
else err += params->err_add_2;
}
}
else
{
struct rop_codes codes;
rop_codes_from_stretch_mode( mode, &codes );
for (width = params->length; width; width--)
{
do_rop_codes_8( dst_ptr, *src_ptr, &codes );
dst_ptr += params->dst_inc;
if (err > 0)
{
src_ptr += params->src_inc;
err += params->err_add_1;
}
else err += params->err_add_2;
} }
else err += params->err_add_2;
} }
} }