Skip to content

Commit

Permalink
VIPS 8.4.6 -> 8.5.5.
Browse files Browse the repository at this point in the history
  • Loading branch information
aaron42net committed May 29, 2017
1 parent e610fc7 commit 4ed8682
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion cmd/fotomat/version.go
Expand Up @@ -8,7 +8,7 @@ import (

const (
// FotomatVersion is updated by git-hooks/pre-commit
FotomatVersion = "2.7.214"
FotomatVersion = "2.7.215"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion preinstall.sh
Expand Up @@ -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:-}"
Expand Down
4 changes: 2 additions & 2 deletions vips/foreign.h
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions vips/init.h
Expand Up @@ -2,7 +2,13 @@
#include <vips/vips.h>
#include <vips/vips7compat.h>

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");
}

0 comments on commit 4ed8682

Please sign in to comment.