kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

ImBuf: Fix compilation error with older libpng

Browse Source 
Older libpng library does not use const pointer to a memory.

The exact version is a bit of a guess here, maybe needs tweaks to it tho.
This commit is contained in:
Sergey Sharybin 2015-07-11 19:18:20 +02:00
parent 3a810bfed6
commit 5a19d9d8f3
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/imbuf/intern/png.c
View File

@ -71,7 +71,14 @@ int imb_is_a_png(const unsigned char *mem)
{
int ret_val = 0;
if (mem) ret_val = !png_sig_cmp(mem, 0, 8);
if (mem) {
#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR == 2)
/* Older version of libpng doesn't use const pointer to memory. */
ret_val = !png_sig_cmp((png_bytep)mem, 0, 8);
#else
ret_val = !png_sig_cmp(mem, 0, 8);
#endif
}
return(ret_val);
}