maride/guacamole-spice-protocol
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Detect and use png_get_io_ptr if provided

Browse Source
This commit is contained in:
Michael Jumper 2011-02-15 18:07:19 -08:00
parent d32b26ffa8
commit 5cdfad50e6
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libguac/configure.in
View File

@ -24,7 +24,7 @@ AC_TYPE_SSIZE_T
# Checks for library functions. # Checks for library functions.
AC_FUNC_MALLOC AC_FUNC_MALLOC
AC_FUNC_REALLOC AC_FUNC_REALLOC
AC_CHECK_FUNCS([gettimeofday memmove memset select strdup]) AC_CHECK_FUNCS([gettimeofday memmove memset select strdup png_get_io_ptr])
AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([Makefile])
AC_OUTPUT AC_OUTPUT

10
libguac/src/protocol.c
View File

@ -248,7 +248,15 @@ void guac_send_copy(GUACIO* io, int srcl, int srcx, int srcy, int w, int h, int
void __guac_write_png(png_structp png, png_bytep data, png_size_t length) { void __guac_write_png(png_structp png, png_bytep data, png_size_t length) {
if (guac_write_base64((GUACIO*) png->io_ptr, data, length) < 0) { #ifdef HAVE_PNG_GET_IO_PTR
GUACIO* io = (GUACIO*) png_get_io_ptr(png);
#else
/* Direct access to io_ptr has been deprecated, but we'll
use it if we have to. */
GUACIO* io = (GUACIO*) png->io_ptr;
#endif
if (guac_write_base64(io, data, length) < 0) {
perror("Error writing PNG"); perror("Error writing PNG");
png_error(png, "Error writing PNG"); png_error(png, "Error writing PNG");
return; return;