sergiotarxz/libvips
sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

paste in various fixes from Kleis

Browse Source
This commit is contained in:
John Cupitt 2019-10-28 08:51:47 +00:00
parent 552043c2c8
commit ed6b26fcb1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libvips/foreign/dzsave.c
View File

@ -1036,7 +1036,7 @@ build_scan_properties( VipsImage *image )
char *date; char *date;
int i; int i;
#ifdef HAVE_DATE_TIME_FORMAT_ISO860 #ifdef HAVE_DATE_TIME_FORMAT_ISO8601
{ {
GDateTime *now; GDateTime *now;
@ -1044,14 +1044,14 @@ build_scan_properties( VipsImage *image )
date = g_date_time_format_iso8601( now ); date = g_date_time_format_iso8601( now );
g_date_time_unref( now ); g_date_time_unref( now );
} }
#else /*!HAVE_DATE_TIME_FORMAT_ISO860*/ #else /*!HAVE_DATE_TIME_FORMAT_ISO8601*/
{ {
GTimeVal now; GTimeVal now;
g_get_current_time( &now ); g_get_current_time( &now );
date = g_time_val_to_iso8601( &now ); date = g_time_val_to_iso8601( &now );
} }
#endif /*HAVE_DATE_TIME_FORMAT_ISO860*/ #endif /*HAVE_DATE_TIME_FORMAT_ISO8601*/
vips_dbuf_init( &dbuf ); vips_dbuf_init( &dbuf );

2
libvips/foreign/webp2vips.c
View File

@ -446,7 +446,7 @@ read_header( Read *read, VipsImage *out )
do { do {
g_assert( iter.frame_num >= 1 && g_assert( iter.frame_num >= 1 &&
iter.frame_num < read->frame_count ); iter.frame_num <= read->frame_count );
read->delays[iter.frame_num - 1] = read->delays[iter.frame_num - 1] =
iter.duration; iter.duration;

2
libvips/iofuncs/streami.c
View File

@ -556,7 +556,7 @@ vips_streami_unminimise( VipsStreami *streami )
stream->descriptor = fd; stream->descriptor = fd;
VIPS_DEBUG_MSG( "vips_streami_unminimise: " VIPS_DEBUG_MSG( "vips_streami_unminimise: "
"restoring read position %zd\n", "restoring read position %" G_GINT64_FORMAT "\n",
streami->read_position ); streami->read_position );
if( vips__seek( stream->descriptor, if( vips__seek( stream->descriptor,
streami->read_position, SEEK_SET ) == -1 ) streami->read_position, SEEK_SET ) == -1 )

2
libvips/iofuncs/util.c
View File

@ -1078,7 +1078,7 @@ vips__ftruncate( int fd, gint64 pos )
LARGE_INTEGER p; LARGE_INTEGER p;
p.QuadPart = pos; p.QuadPart = pos;
if( vips__seek( fd, pos ) ) if( vips__seek( fd, pos, SEEK_SET ) )
return( -1 ); return( -1 );
if( !SetEndOfFile( hFile ) ) { if( !SetEndOfFile( hFile ) ) {
vips_error_system( GetLastError(), "vips__ftruncate", vips_error_system( GetLastError(), "vips__ftruncate",