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

fix alignment

Browse Source
This commit is contained in:
Alexander 2017-09-23 04:44:01 +03:00
parent 4b85230726
commit 145180a105
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libImaging/Storage.c
View File

@ -389,20 +389,21 @@ ImagingAllocateArray(Imaging im, int dirty, int block_size)
int y, line_in_block, current_block; int y, line_in_block, current_block;
ImagingMemoryArena arena = &ImagingDefaultArena; ImagingMemoryArena arena = &ImagingDefaultArena;
ImagingMemoryBlock block = {NULL, 0}; ImagingMemoryBlock block = {NULL, 0};
int linesize, lines_per_block, blocks_count; int aligned_linesize, lines_per_block, blocks_count;
void *aligned_ptr;
/* 0-width or 0-height image. No need to do anything */ /* 0-width or 0-height image. No need to do anything */
if ( ! im->linesize || ! im->ysize) { if ( ! im->linesize || ! im->ysize) {
return im; return im;
} }
linesize = (im->linesize + arena->alignment - 1) & -arena->alignment; aligned_linesize = (im->linesize + arena->alignment - 1) & -arena->alignment;
lines_per_block = block_size / linesize; lines_per_block = block_size / aligned_linesize;
if (lines_per_block == 0) if (lines_per_block == 0)
lines_per_block = 1; 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, aligned_linesize, lines_per_block, blocks_count);
/* One extra ponter is always NULL */ /* One extra ponter is always NULL */
im->blocks = calloc(sizeof(*im->blocks), blocks_count + 1); im->blocks = calloc(sizeof(*im->blocks), blocks_count + 1);
@ -416,19 +417,25 @@ ImagingAllocateArray(Imaging im, int dirty, int block_size)
current_block = blocks_count - 1; current_block = blocks_count - 1;
for (y = 0; y < im->ysize; y++) { for (y = 0; y < im->ysize; y++) {
if (line_in_block == 0) { if (line_in_block == 0) {
int block_size;
int lines_remained = lines_per_block; int lines_remained = lines_per_block;
if (lines_remained > im->ysize - y) { if (lines_remained > im->ysize - y) {
lines_remained = im->ysize - y; lines_remained = im->ysize - y;
} }
block = memory_get_block(arena, lines_remained * linesize, dirty); block_size = lines_remained * aligned_linesize + arena->alignment - 1;
block = memory_get_block(arena, block_size, dirty);
if ( ! block.ptr) { if ( ! block.ptr) {
ImagingDestroyArray(im); ImagingDestroyArray(im);
return (Imaging) ImagingError_MemoryError(); return (Imaging) ImagingError_MemoryError();
} }
im->blocks[current_block] = block; im->blocks[current_block] = block;
/* This is copied from libc _int_memalign */
aligned_ptr = (void *)(
((unsigned long) (block.ptr + arena->alignment - 1)) &
-((signed long) arena->alignment));
} }
im->image[y] = block.ptr + linesize * line_in_block; im->image[y] = aligned_ptr + aligned_linesize * line_in_block;
line_in_block += 1; line_in_block += 1;
if (line_in_block >= lines_per_block) { if (line_in_block >= lines_per_block) {