dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2025-02-13 15:32:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix alpha-plane copy and crop methods

Browse Source 
the alpha-plane was not reallocated properly.

Change-Id: I5db445c7086b3c7c5cf98631d714350119dd7c2a
This commit is contained in:
Pascal Massimino 2011-04-26 06:37:30 -07:00
parent cdef89de0e
commit b8dcbf2f35
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/enc/picture.c
View File

@ -81,9 +81,14 @@ int WebPPictureCopy(const WebPPicture* const src, WebPPicture* const dst) {
if (src == dst) return 1; if (src == dst) return 1;
*dst = *src; *dst = *src;
dst->y = NULL; dst->y = NULL;
dst->a = NULL;
if (!WebPPictureAlloc(dst)) return 0; if (!WebPPictureAlloc(dst)) return 0;
if (src->a != NULL && !WebPPictureAddAlphaPlane(dst)) return 0;
for (y = 0; y < dst->height; ++y) { for (y = 0; y < dst->height; ++y) {
memcpy(dst->y + y * dst->y_stride, src->y + y * src->y_stride, src->width); memcpy(dst->y + y * dst->y_stride, src->y + y * src->y_stride, src->width);
if (dst->a != NULL) {
memcpy(dst->a + y * dst->width, src->a + y * src->width, src->width);
}
} }
for (y = 0; y < (dst->height + 1) / 2; ++y) { for (y = 0; y < (dst->height + 1) / 2; ++y) {
memcpy(dst->u + y * dst->uv_stride, memcpy(dst->u + y * dst->uv_stride,
@ -106,13 +111,19 @@ int WebPPictureCrop(WebPPicture* const pic,
tmp = *pic; tmp = *pic;
tmp.y = NULL; tmp.y = NULL;
tmp.a = NULL;
tmp.width = width; tmp.width = width;
tmp.height = height; tmp.height = height;
if (!WebPPictureAlloc(&tmp)) return 0; if (!WebPPictureAlloc(&tmp)) return 0;
if (pic->a != NULL && !WebPPictureAddAlphaPlane(&tmp)) return 0;
for (y = 0; y < height; ++y) { for (y = 0; y < height; ++y) {
memcpy(tmp.y + y * tmp.y_stride, memcpy(tmp.y + y * tmp.y_stride,
pic->y + (top + y) * pic->y_stride + left, width); pic->y + (top + y) * pic->y_stride + left, width);
if (tmp.a) {
memcpy(tmp.a + y * tmp.width,
pic->a + (top + y) * pic->width + left, width);
}
} }
for (y = 0; y < (height + 1) / 2; ++y) { for (y = 0; y < (height + 1) / 2; ++y) {
const int offset = (y + top / 2) * pic->uv_stride + left / 2; const int offset = (y + top / 2) * pic->uv_stride + left / 2;