diff --git a/README.md b/README.md index 9c22b6e..fdfb1ea 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ There's also API detail for Fotomat's [thumbnail](https://godoc.org/github.com/d License ------- -Copyright 2013, 2014, 2015, 2016 Aaron Hopkins and contributors +Copyright 2013, 2014, 2015, 2016, 2017 Aaron Hopkins and contributors Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at: http://www.apache.org/licenses/LICENSE-2.0 diff --git a/cmd/fotomat/version.go b/cmd/fotomat/version.go index 23c5637..73795cd 100644 --- a/cmd/fotomat/version.go +++ b/cmd/fotomat/version.go @@ -8,7 +8,7 @@ import ( const ( // FotomatVersion is updated by git-hooks/pre-commit - FotomatVersion = "2.7.214" + FotomatVersion = "2.7.215" ) var ( diff --git a/preinstall.sh b/preinstall.sh index b231e0d..be58ca0 100755 --- a/preinstall.sh +++ b/preinstall.sh @@ -7,7 +7,7 @@ set -euo pipefail # Usage: sudo ./preinstall.sh -VIPS_VERSION=${VIPS_VERSION:-8.4.6} +VIPS_VERSION=${VIPS_VERSION:-8.5.5} GO_VERSION=${GO_VERSION:-1.8.3} export PATH="/usr/local/bin:/usr/bin:/bin:${PATH:-}" diff --git a/vips/foreign.h b/vips/foreign.h index ad4a355..7d8d1e6 100644 --- a/vips/foreign.h +++ b/vips/foreign.h @@ -29,12 +29,12 @@ cgo_vips_jpegsave_buffer(VipsImage *in, void **buf, size_t *len, int strip, int int cgo_vips_pngload(const char *filename, VipsImage **out) { - return vips_pngload(filename, out, "access", VIPS_ACCESS_SEQUENTIAL_UNBUFFERED, NULL); + return vips_pngload(filename, out, NULL); } int cgo_vips_pngload_buffer(void *buf, size_t len, VipsImage **out) { - return vips_pngload_buffer(buf, len, out, "access", VIPS_ACCESS_SEQUENTIAL_UNBUFFERED, NULL); + return vips_pngload_buffer(buf, len, out, NULL); } int diff --git a/vips/init.h b/vips/init.h index ec95a53..7b3ff4d 100644 --- a/vips/init.h +++ b/vips/init.h @@ -2,7 +2,13 @@ #include #include +int +cgo_vips_warning_callback(char const* log_domain, GLogLevelFlags log_level, char const* message, void* ignore) { + // Do nothing +} + int cgo_vips_init() { + g_log_set_handler("VIPS", G_LOG_LEVEL_WARNING, (GLogFunc)cgo_vips_warning_callback, NULL); return VIPS_INIT("fotomat"); }