enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

evas - image loader - tiff - switch types to avoid deprecated warnings

This commit is contained in:
Carsten Haitzler 2021-05-03 18:01:29 +01:00
parent a3510d5085
commit 84e907ef7d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/evas/image_loaders/tiff/evas_image_load_tiff.c
View File

@ -28,8 +28,8 @@ typedef struct TIFFRGBAMap TIFFRGBAMap;
struct TIFFRGBAImage_Extra { struct TIFFRGBAImage_Extra {
TIFFRGBAImage rgba; TIFFRGBAImage rgba;
char pper; char pper;
uint32 num_pixels; uint32_t num_pixels;
uint32 py; uint32_t py;
}; };
struct TIFFRGBAMap { struct TIFFRGBAMap {
@ -112,7 +112,7 @@ evas_image_load_file_head_tiff(void *loader_data,
TIFFRGBAMap tiff_map; TIFFRGBAMap tiff_map;
TIFF *tif = NULL; TIFF *tif = NULL;
unsigned char *map; unsigned char *map;
uint16 magic_number; uint16_t magic_number;
Eina_Bool r = EINA_FALSE; Eina_Bool r = EINA_FALSE;
map = eina_file_map_all(f, EINA_FILE_RANDOM); map = eina_file_map_all(f, EINA_FILE_RANDOM);
@ -122,7 +122,7 @@ evas_image_load_file_head_tiff(void *loader_data,
goto on_error; goto on_error;
} }
magic_number = *((uint16*) map); magic_number = *((uint16_t *)map);
if ((magic_number != TIFF_BIGENDIAN) /* Checks if actually tiff file */ if ((magic_number != TIFF_BIGENDIAN) /* Checks if actually tiff file */
&& (magic_number != TIFF_LITTLEENDIAN)) && (magic_number != TIFF_LITTLEENDIAN))
@ -196,10 +196,10 @@ evas_image_load_file_data_tiff(void *loader_data,
TIFFRGBAMap rgba_map; TIFFRGBAMap rgba_map;
TIFF *tif = NULL; TIFF *tif = NULL;
unsigned char *map; unsigned char *map;
uint32 *rast = NULL; uint32_t *rast = NULL;
uint32 num_pixels; uint32_t num_pixels;
int x, y; int x, y;
uint16 magic_number; uint16_t magic_number;
Eina_Bool res = EINA_FALSE; Eina_Bool res = EINA_FALSE;
map = eina_file_map_all(f, EINA_FILE_SEQUENTIAL); map = eina_file_map_all(f, EINA_FILE_SEQUENTIAL);
@ -209,7 +209,7 @@ evas_image_load_file_data_tiff(void *loader_data,
goto on_error; goto on_error;
} }
magic_number = *((uint16*) map); magic_number = *((uint16_t *)map);
if ((magic_number != TIFF_BIGENDIAN) /* Checks if actually tiff file */ if ((magic_number != TIFF_BIGENDIAN) /* Checks if actually tiff file */
&& (magic_number != TIFF_LITTLEENDIAN)) && (magic_number != TIFF_LITTLEENDIAN))
@ -257,7 +257,7 @@ evas_image_load_file_data_tiff(void *loader_data,
rgba_image.num_pixels = num_pixels = prop->w * prop->h; rgba_image.num_pixels = num_pixels = prop->w * prop->h;
rgba_image.pper = rgba_image.py = 0; rgba_image.pper = rgba_image.py = 0;
rast = (uint32 *) _TIFFmalloc(sizeof(uint32) * num_pixels); rast = (uint32_t *) _TIFFmalloc(sizeof(uint32_t) * num_pixels);
if (!rast) if (!rast)
{ {
@ -284,7 +284,7 @@ evas_image_load_file_data_tiff(void *loader_data,
for (y = 0; y < (int)prop->h; y++) for (y = 0; y < (int)prop->h; y++)
{ {
DATA32 *pix, *pd; DATA32 *pix, *pd;
uint32 *ps, pixel; uint32_t *ps, pixel;
unsigned int a, r, g, b; unsigned int a, r, g, b;
unsigned int nas = 0; unsigned int nas = 0;