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

Merge branch '8.7'

Browse Source
This commit is contained in:
John Cupitt 2018-10-01 21:23:48 +01:00
commit 703498aa81
3 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -4,6 +4,7 @@
23/9/18 started 8.7.1 23/9/18 started 8.7.1
- update function list in docs [janko-m] - update function list in docs [janko-m]
- test for g_str_to_ascii() [jcupitt]
23/12/17 started 8.7.0 23/12/17 started 8.7.0
- add magicksave, save image with libMagick [dlemstra] - add magicksave, save image with libMagick [dlemstra]

10
configure.ac
View File

@ -505,7 +505,7 @@ PKG_CHECK_MODULES(TYPE_INIT, glib-2.0 < 2.36,
] ]
) )
# from 2.40 we have g_win32_get_command_line() on win # from 2.40, on win32 we have g_win32_get_command_line()
PKG_CHECK_MODULES(WIN32_GET_COMMAND_LINE, glib-2.0 >= 2.40, PKG_CHECK_MODULES(WIN32_GET_COMMAND_LINE, glib-2.0 >= 2.40,
[if test x"$vips_os_win32" = x"yes"; then [if test x"$vips_os_win32" = x"yes"; then
AC_DEFINE(HAVE_G_WIN32_GET_COMMAND_LINE,1,[define if your glib has g_win32_get_command_line().]) AC_DEFINE(HAVE_G_WIN32_GET_COMMAND_LINE,1,[define if your glib has g_win32_get_command_line().])
@ -516,6 +516,14 @@ PKG_CHECK_MODULES(WIN32_GET_COMMAND_LINE, glib-2.0 >= 2.40,
] ]
) )
# from 2.40, have g_str_to_ascii()
PKG_CHECK_MODULES(STR_TO_ASCII, glib-2.0 >= 2.40,
[AC_DEFINE(HAVE_G_STR_TO_ASCII,1,[define if your glib has g_str_to_ascii().])
],
[:
]
)
# from 2.48 we have g_uint_checked_mul() etc. # from 2.48 we have g_uint_checked_mul() etc.
PKG_CHECK_MODULES(HAVE_CHECKED_MUL, glib-2.0 >= 2.48, PKG_CHECK_MODULES(HAVE_CHECKED_MUL, glib-2.0 >= 2.48,
[AC_DEFINE(HAVE_CHECKED_MUL,1,[define if your glib has checked multiply.]) [AC_DEFINE(HAVE_CHECKED_MUL,1,[define if your glib has checked multiply.])

31
libvips/foreign/exif.c
View File

@ -832,24 +832,30 @@ vips_exif_set_string_encoding( ExifData *ed,
ExifEntry *entry, unsigned long component, const char *data ) ExifEntry *entry, unsigned long component, const char *data )
{ {
char *str; char *str;
char *ascii;
int len; int len;
str = drop_tail( data ); str = drop_tail( data );
/* libexif can only really save ASCII to things like UserComment. /* libexif can only really save ASCII to things like UserComment.
*/ */
#ifdef HAVE_G_STR_TO_ASCII
{
char *ascii;
ascii = g_str_to_ascii( str, NULL ); ascii = g_str_to_ascii( str, NULL );
g_free( str );
str = ascii;
}
#endif /*HAVE_G_STR_TO_ASCII*/
/* libexif comment strings are not NULL-terminated, and have an /* libexif comment strings are not NULL-terminated, and have an
* encoding tag (always ASCII) in the first 8 bytes. * encoding tag (always ASCII) in the first 8 bytes.
*/ */
len = strlen( ascii ); len = strlen( str );
vips_exif_alloc_string( entry, sizeof( ASCII_COMMENT ) - 1 + len ); vips_exif_alloc_string( entry, sizeof( ASCII_COMMENT ) - 1 + len );
memcpy( entry->data, ASCII_COMMENT, sizeof( ASCII_COMMENT ) - 1 ); memcpy( entry->data, ASCII_COMMENT, sizeof( ASCII_COMMENT ) - 1 );
memcpy( entry->data + sizeof( ASCII_COMMENT ) - 1, ascii, len ); memcpy( entry->data + sizeof( ASCII_COMMENT ) - 1, str, len );
g_free( ascii );
g_free( str ); g_free( str );
} }
@ -861,20 +867,29 @@ vips_exif_set_string_ascii( ExifData *ed,
ExifEntry *entry, unsigned long component, const char *data ) ExifEntry *entry, unsigned long component, const char *data )
{ {
char *str; char *str;
char *ascii;
int len; int len;
str = drop_tail( data ); str = drop_tail( data );
/* libexif can only really save ASCII to things like UserComment.
*/
#ifdef HAVE_G_STR_TO_ASCII
{
char *ascii;
ascii = g_str_to_ascii( str, NULL ); ascii = g_str_to_ascii( str, NULL );
g_free( str );
str = ascii;
}
#endif /*HAVE_G_STR_TO_ASCII*/
/* ASCII strings are NULL-terminated. /* ASCII strings are NULL-terminated.
*/ */
len = strlen( ascii ); len = strlen( str );
vips_exif_alloc_string( entry, len + 1 ); vips_exif_alloc_string( entry, len + 1 );
memcpy( entry->data, ascii, len + 1 ); memcpy( entry->data, str, len + 1 );
entry->format = EXIF_FORMAT_ASCII; entry->format = EXIF_FORMAT_ASCII;
g_free( ascii );
g_free( str ); g_free( str );
} }