dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 22:28:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "fix orig_rect==NULL case"

Browse Source
This commit is contained in:
Pascal Massimino 2014-06-12 00:48:30 -07:00 committed by Gerrit Code Review
commit d6cd6358ff
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
examples/gif2webp_util.c
View File

@ -520,7 +520,7 @@ static void DisposeFrame(WebPMuxAnimDispose dispose_method,
int WebPFrameCacheAddFrame(WebPFrameCache* const cache, int WebPFrameCacheAddFrame(WebPFrameCache* const cache,
const WebPConfig* const config, const WebPConfig* const config,
const WebPFrameRect* const orig_rect, const WebPFrameRect* const orig_rect_ptr,
WebPPicture* const frame, WebPPicture* const frame,
WebPMuxFrameInfo* const info) { WebPMuxFrameInfo* const info) {
int ok = 0; int ok = 0;
@ -531,26 +531,29 @@ int WebPFrameCacheAddFrame(WebPFrameCache* const cache,
const size_t position = cache->count; const size_t position = cache->count;
const int allow_mixed = cache->allow_mixed; const int allow_mixed = cache->allow_mixed;
EncodedFrame* const encoded_frame = CacheGetFrame(cache, position); EncodedFrame* const encoded_frame = CacheGetFrame(cache, position);
WebPFrameRect orig_rect;
assert(position < cache->size); assert(position < cache->size);
if (frame == NULL || info == NULL) { if (frame == NULL || info == NULL) {
return 0; return 0;
} }
if (orig_rect != NULL) { if (orig_rect_ptr == NULL) {
rect = *orig_rect; orig_rect.width = frame->width;
// Snap to even offsets (and adjust dimensions if needed). orig_rect.height = frame->height;
rect.width += (rect.x_offset & 1); orig_rect.x_offset = 0;
rect.height += (rect.y_offset & 1); orig_rect.y_offset = 0;
rect.x_offset &= ~1;
rect.y_offset &= ~1;
} else { } else {
rect.width = frame->width; orig_rect = *orig_rect_ptr;
rect.height = frame->height;
rect.x_offset = 0;
rect.y_offset = 0;
} }
// Snap to even offsets (and adjust dimensions if needed).
rect = orig_rect;
rect.width += (rect.x_offset & 1);
rect.height += (rect.y_offset & 1);
rect.x_offset &= ~1;
rect.y_offset &= ~1;
if (!WebPPictureView(frame, rect.x_offset, rect.y_offset, if (!WebPPictureView(frame, rect.x_offset, rect.y_offset,
rect.width, rect.height, &sub_image)) { rect.width, rect.height, &sub_image)) {
return 0; return 0;
@ -583,7 +586,7 @@ int WebPFrameCacheAddFrame(WebPFrameCache* const cache,
} }
cache->flush_count = cache->count; cache->flush_count = cache->count;
// Update prev_canvas by blending 'curr' into it. // Update prev_canvas by blending 'curr' into it.
BlendPixels(frame, orig_rect, prev_canvas); BlendPixels(frame, &orig_rect, prev_canvas);
} else { } else {
WebPPicture full_image; WebPPicture full_image;
WebPMuxFrameInfo full_image_info; WebPMuxFrameInfo full_image_info;
@ -630,7 +633,7 @@ int WebPFrameCacheAddFrame(WebPFrameCache* const cache,
} }
} }
DisposeFrame(info->dispose_method, orig_rect, frame, prev_canvas); DisposeFrame(info->dispose_method, &orig_rect, frame, prev_canvas);
cache->is_first_frame = 0; cache->is_first_frame = 0;
ok = 1; ok = 1;