summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-05-03 18:01:29 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2021-05-03 18:01:29 +0100
commit84e907ef7df6306eddf866bad9a500dde856117e (patch)
tree893bad33c8569ac6eff321d5502ecd28c10f613c /src
parenta3510d5085a0616457f76de41d843cdf76dbbf7f (diff)
evas - image loader - tiff - switch types to avoid deprecated warnings
Diffstat (limited to 'src')
-rw-r--r--src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
index 297c8175b0..94358d849d 100644
--- a/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
+++ b/src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
@@ -28,8 +28,8 @@ typedef struct TIFFRGBAMap TIFFRGBAMap;
28struct TIFFRGBAImage_Extra { 28struct TIFFRGBAImage_Extra {
29 TIFFRGBAImage rgba; 29 TIFFRGBAImage rgba;
30 char pper; 30 char pper;
31 uint32 num_pixels; 31 uint32_t num_pixels;
32 uint32 py; 32 uint32_t py;
33}; 33};
34 34
35struct TIFFRGBAMap { 35struct TIFFRGBAMap {
@@ -112,7 +112,7 @@ evas_image_load_file_head_tiff(void *loader_data,
112 TIFFRGBAMap tiff_map; 112 TIFFRGBAMap tiff_map;
113 TIFF *tif = NULL; 113 TIFF *tif = NULL;
114 unsigned char *map; 114 unsigned char *map;
115 uint16 magic_number; 115 uint16_t magic_number;
116 Eina_Bool r = EINA_FALSE; 116 Eina_Bool r = EINA_FALSE;
117 117
118 map = eina_file_map_all(f, EINA_FILE_RANDOM); 118 map = eina_file_map_all(f, EINA_FILE_RANDOM);
@@ -122,7 +122,7 @@ evas_image_load_file_head_tiff(void *loader_data,
122 goto on_error; 122 goto on_error;
123 } 123 }
124 124
125 magic_number = *((uint16*) map); 125 magic_number = *((uint16_t *)map);
126 126
127 if ((magic_number != TIFF_BIGENDIAN) /* Checks if actually tiff file */ 127 if ((magic_number != TIFF_BIGENDIAN) /* Checks if actually tiff file */
128 && (magic_number != TIFF_LITTLEENDIAN)) 128 && (magic_number != TIFF_LITTLEENDIAN))
@@ -196,10 +196,10 @@ evas_image_load_file_data_tiff(void *loader_data,
196 TIFFRGBAMap rgba_map; 196 TIFFRGBAMap rgba_map;
197 TIFF *tif = NULL; 197 TIFF *tif = NULL;
198 unsigned char *map; 198 unsigned char *map;
199 uint32 *rast = NULL; 199 uint32_t *rast = NULL;
200 uint32 num_pixels; 200 uint32_t num_pixels;
201 int x, y; 201 int x, y;
202 uint16 magic_number; 202 uint16_t magic_number;
203 Eina_Bool res = EINA_FALSE; 203 Eina_Bool res = EINA_FALSE;
204 204
205 map = eina_file_map_all(f, EINA_FILE_SEQUENTIAL); 205 map = eina_file_map_all(f, EINA_FILE_SEQUENTIAL);
@@ -209,7 +209,7 @@ evas_image_load_file_data_tiff(void *loader_data,
209 goto on_error; 209 goto on_error;
210 } 210 }
211 211
212 magic_number = *((uint16*) map); 212 magic_number = *((uint16_t *)map);
213 213
214 if ((magic_number != TIFF_BIGENDIAN) /* Checks if actually tiff file */ 214 if ((magic_number != TIFF_BIGENDIAN) /* Checks if actually tiff file */
215 && (magic_number != TIFF_LITTLEENDIAN)) 215 && (magic_number != TIFF_LITTLEENDIAN))
@@ -257,7 +257,7 @@ evas_image_load_file_data_tiff(void *loader_data,
257 rgba_image.num_pixels = num_pixels = prop->w * prop->h; 257 rgba_image.num_pixels = num_pixels = prop->w * prop->h;
258 258
259 rgba_image.pper = rgba_image.py = 0; 259 rgba_image.pper = rgba_image.py = 0;
260 rast = (uint32 *) _TIFFmalloc(sizeof(uint32) * num_pixels); 260 rast = (uint32_t *) _TIFFmalloc(sizeof(uint32_t) * num_pixels);
261 261
262 if (!rast) 262 if (!rast)
263 { 263 {
@@ -284,7 +284,7 @@ evas_image_load_file_data_tiff(void *loader_data,
284 for (y = 0; y < (int)prop->h; y++) 284 for (y = 0; y < (int)prop->h; y++)
285 { 285 {
286 DATA32 *pix, *pd; 286 DATA32 *pix, *pd;
287 uint32 *ps, pixel; 287 uint32_t *ps, pixel;
288 unsigned int a, r, g, b; 288 unsigned int a, r, g, b;
289 unsigned int nas = 0; 289 unsigned int nas = 0;
290 290