python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-26 00:30:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix 0-width and 0-height images other way

Browse Source
This commit is contained in:
Alexander 2017-09-17 03:31:24 +03:00
parent 0054743100
commit fd907fbdc9
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libImaging/Storage.c
View File

@ -278,9 +278,6 @@ _get_block(int requested_size, int dirty)
if ( ! _blocks) { if ( ! _blocks) {
_blocks = calloc(sizeof(void*), MEMORY_CACHE_BLOCKS); _blocks = calloc(sizeof(void*), MEMORY_CACHE_BLOCKS);
} }
if ( ! requested_size) {
requested_size = 1;
}
if (_blocks_free > 0) { if (_blocks_free > 0) {
_blocks_free -= 1; _blocks_free -= 1;
// printf("get block: %p %d; _blocks_free: %d\n", // printf("get block: %p %d; _blocks_free: %d\n",
@ -343,16 +340,20 @@ ImagingAllocateArray(Imaging im, int dirty)
char* p; char* p;
int linesize, lines_per_block, blocks_count; int linesize, lines_per_block, blocks_count;
linesize = (im->linesize + MEMORY_ALIGN_LINES - 1) & -MEMORY_ALIGN_LINES; /* 0-width or 0-height image. No need to do anything */
if ( ! linesize || linesize > MEMORY_BLOCK_SIZE) { if ( ! im->linesize || ! im->ysize) {
lines_per_block = 1; return im;
} else {
lines_per_block = MEMORY_BLOCK_SIZE / linesize;
} }
linesize = (im->linesize + MEMORY_ALIGN_LINES - 1) & -MEMORY_ALIGN_LINES;
lines_per_block = MEMORY_BLOCK_SIZE / linesize;
if (lines_per_block == 0)
lines_per_block = 1;
blocks_count = (im->ysize + lines_per_block - 1) / lines_per_block; blocks_count = (im->ysize + lines_per_block - 1) / lines_per_block;
// printf("NEW size: %dx%d, ls: %d, lpb: %d, blocks: %d\n", // printf("NEW size: %dx%d, ls: %d, lpb: %d, blocks: %d\n",
// im->xsize, im->ysize, linesize, lines_per_block, blocks_count); // im->xsize, im->ysize, linesize, lines_per_block, blocks_count);
im->destroy = ImagingDestroyArray;
/* One extra ponter is always NULL */ /* One extra ponter is always NULL */
im->blocks = (char **)calloc(sizeof(char *), blocks_count + 1); im->blocks = (char **)calloc(sizeof(char *), blocks_count + 1);
if ( ! im->blocks) { if ( ! im->blocks) {
@ -368,8 +369,7 @@ ImagingAllocateArray(Imaging im, int dirty)
} }
p = (char *)_get_block(lines_remained * linesize, dirty); p = (char *)_get_block(lines_remained * linesize, dirty);
if ( ! p) { if ( ! p) {
ImagingDestroyArray(im); return (Imaging) ImagingError_MemoryError();
break;
} }
im->blocks[current_block] = p; im->blocks[current_block] = p;
} }
@ -384,12 +384,6 @@ ImagingAllocateArray(Imaging im, int dirty)
} }
} }
if (y != im->ysize) {
return (Imaging) ImagingError_MemoryError();
}
im->destroy = ImagingDestroyArray;
return im; return im;
} }