diff options
author | Kim Woelders <kim@woelders.dk> | 2008-05-07 21:41:44 +0000 |
---|---|---|
committer | Kim Woelders <kim@woelders.dk> | 2008-05-07 21:41:44 +0000 |
commit | 3c8de2fbef80f4863b9efb918c738e1f2e452a96 (patch) | |
tree | 1dbcdcfcaf81359151e4baf0cb4a36aa3b2b9f47 /src | |
parent | 8571e8798c30d1c3947efae464cae6f9d4b6d721 (diff) | |
download | imlib2-3c8de2fbef80f4863b9efb918c738e1f2e452a96.tar.gz |
Remove incorrect test in __imlib_copy_alpha_data() (Victor Paesa - bug 475).
SVN revision: 34504
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/rgbadraw.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/src/lib/rgbadraw.c b/src/lib/rgbadraw.c index 3dbf895..e4dc284 100644 --- a/src/lib/rgbadraw.c +++ b/src/lib/rgbadraw.c @@ -603,20 +603,17 @@ __imlib_copy_alpha_data(ImlibImage * src, ImlibImage * dst, int x, int y, /* the pointer jump between lines */ jump = (src->w - w); jump2 = (dst->w - w); - /* copy forwards */ - if (p2 < p1) - { - /* work our way thru the array */ - for (yy = 0; yy < h; yy++) - { - for (xx = 0; xx < w; xx++) - { - *p2 = (*p1 & 0xff000000) | (*p2 & 0x00ffffff); - p1++; - p2++; - } - p1 += jump; - p2 += jump2; - } - } + + /* work our way thru the array */ + for (yy = 0; yy < h; yy++) + { + for (xx = 0; xx < w; xx++) + { + *p2 = (*p1 & 0xff000000) | (*p2 & 0x00ffffff); + p1++; + p2++; + } + p1 += jump; + p2 += jump2; + } } |