mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[master] Use bitwise AND instead of integer arithmetic MOD in pngrutil.c

Browse Source 
calculation  of the png_ptr->rowbuf pointer into png_ptr->big_row_buf.
This commit is contained in:
Glenn Randers-Pehrson 2010-05-03 21:57:13 -05:00
parent cc0bff446b
commit a1587302aa
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pngrutil.c
View File

@ -3312,11 +3312,6 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
if (row_bytes + 48 > png_ptr->old_big_row_buf_size) if (row_bytes + 48 > png_ptr->old_big_row_buf_size)
{ {
#ifdef PNG_ALIGNED_MEMORY_SUPPORTED
png_size_t big_row_buf_address;
int row_buf_offset;
#endif
png_free(png_ptr, png_ptr->big_row_buf); png_free(png_ptr, png_ptr->big_row_buf);
if (png_ptr->interlaced) if (png_ptr->interlaced)
png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr, png_ptr->big_row_buf = (png_bytep)png_calloc(png_ptr,
@ -3330,11 +3325,8 @@ defined(PNG_USER_TRANSFORM_PTR_SUPPORTED)
/* Use 16-byte aligned memory for row_buf with at least 16 bytes /* Use 16-byte aligned memory for row_buf with at least 16 bytes
* of padding before and after row_buf. * of padding before and after row_buf.
*/ */
{ png_ptr->row_buf = png_ptr->big_row_buf + 32 -
big_row_buf_address = (png_size_t)png_ptr->big_row_buf; (((unsigned long)png_ptr->big_row_buf + 15) & 0x0F);
row_buf_offset = 32 - ((big_row_buf_address + 15) & 0x0F);
png_ptr->row_buf = png_ptr->big_row_buf + row_buf_offset;
}
png_ptr->old_big_row_buf_size = row_bytes + 48; png_ptr->old_big_row_buf_size = row_bytes + 48;
#else #else
/* Use 32 bytes of padding before and 16 bytes after row_buf. */ /* Use 32 bytes of padding before and 16 bytes after row_buf. */