diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2021-11-09 14:25:45 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2021-11-09 14:25:45 +0000 |
| commit | 0a3f783e8476c54d540af080cd7208ab30265e14 (patch) | |
| tree | 37053b260e885aec7a019d8c8ddff06f0054ccb3 /gdk-pixbuf | |
| parent | d10fdf5d977b63b4850e948c531fe708a13edfd8 (diff) | |
| parent | d6445d9fc588239f8e595115161bb58a26e58166 (diff) | |
| download | gdk-pixbuf-0a3f783e8476c54d540af080cd7208ab30265e14.tar.gz | |
Merge branch 'ebassi/tiff-types' into 'master'
tiff: Use non-deprecated C99 integer types
See merge request GNOME/gdk-pixbuf!124
Diffstat (limited to 'gdk-pixbuf')
| -rw-r--r-- | gdk-pixbuf/io-tiff.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/gdk-pixbuf/io-tiff.c b/gdk-pixbuf/io-tiff.c index 5345c9b83..9368ddb48 100644 --- a/gdk-pixbuf/io-tiff.c +++ b/gdk-pixbuf/io-tiff.c @@ -29,6 +29,7 @@ #include "config.h" #include <stdlib.h> +#include <stdint.h> #include <string.h> #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -97,13 +98,13 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error) gint width, height, rowstride, bytes; GdkPixbuf *pixbuf; guint16 bits_per_sample = 0; - uint16 orientation = 0; - uint16 transform = 0; - uint16 codec; + uint16_t orientation = 0; + uint16_t transform = 0; + uint16_t codec; gchar *icc_profile_base64; const gchar *icc_profile; guint icc_profile_size; - uint16 resolution_unit; + uint16_t resolution_unit; gchar *density_str; gint retval; @@ -279,7 +280,7 @@ tiff_image_parse (TIFF *tiff, TiffContext *context, GError **error) if (context) (* context->prepared_func) (pixbuf, NULL, context->user_data); - if (!TIFFReadRGBAImageOriented (tiff, width, height, (uint32 *)pixels, ORIENTATION_TOPLEFT, 1)) { + if (!TIFFReadRGBAImageOriented (tiff, width, height, (uint32_t *)pixels, ORIENTATION_TOPLEFT, 1)) { g_set_error_literal (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_FAILED, @@ -951,7 +952,7 @@ gdk_pixbuf__tiff_image_save_to_callback (GdkPixbufSaveFunc save_func, if (x_dpi != NULL && y_dpi != NULL) { char *endptr = NULL; - uint16 resolution_unit = RESUNIT_INCH; + uint16_t resolution_unit = RESUNIT_INCH; float x_dpi_value, y_dpi_value; x_dpi_value = strtol (x_dpi, &endptr, 10); |