From d063a8168954cade1bc8c566ef973a260c910560 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Wed, 13 Jun 2018 21:33:52 +0100 Subject: [PATCH] fix vipssave on macOS an open had been dropped see https://github.com/jcupitt/libvips/issues/1004 --- compile | 13 +++++++------ libvips/iofuncs/vips.c | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/compile b/compile index a85b723c..99e50524 100755 --- a/compile +++ b/compile @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ EOF echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ exit $ret # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/libvips/iofuncs/vips.c b/libvips/iofuncs/vips.c index 267db0aa..81992337 100644 --- a/libvips/iofuncs/vips.c +++ b/libvips/iofuncs/vips.c @@ -205,6 +205,8 @@ vips__open_image_write( const char *filename, gboolean temp ) else fd = vips_tracked_open( filename, flags, 0666 ); #else /*!O_TMPFILE*/ + fd = vips_tracked_open( filename, flags, 0666 ); + #ifdef _O_TEMPORARY /* On Windows, setting _O_TEMPORARY gets the file automatically * deleted on process exit, even if the processes crashes. See