fix compiler warnings

Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
This commit is contained in:
Thomas E. Dickey 2024-10-27 10:12:52 -04:00
parent b09856069c
commit 7e03738efd
No known key found for this signature in database
GPG key ID: CC2AF4472167BE03

View file

@ -627,25 +627,25 @@ _XcursorWriteComment (XcursorFile *file,
static XcursorImage * static XcursorImage *
_XcursorResizeImage (XcursorImage *src, int size) _XcursorResizeImage (XcursorImage *src, int size)
{ {
int dest_y, dest_x; XcursorDim dest_y, dest_x;
double scale = (double) size / src->size; double scale = (double) size / src->size;
XcursorImage *dest = XcursorImageCreate ((int) (src->width * scale), (int) (src->height * scale)); XcursorImage *dest = XcursorImageCreate ((int) (src->width * scale), (int) (src->height * scale));
if (!dest) if (!dest)
return NULL; return NULL;
dest->size = size; dest->size = (XcursorDim) size;
dest->xhot = (int) (src->xhot * scale); dest->xhot = (XcursorDim) (src->xhot * scale);
dest->yhot = (int) (src->yhot * scale); dest->yhot = (XcursorDim) (src->yhot * scale);
dest->delay = src->delay; dest->delay = src->delay;
for (dest_y = 0; dest_y < dest->height; dest_y++) for (dest_y = 0; dest_y < dest->height; dest_y++)
{ {
int src_y = dest_y / scale; XcursorDim src_y = (XcursorDim) (dest_y / scale);
XcursorPixel *src_row = src->pixels + src_y * src->width; XcursorPixel *src_row = src->pixels + (src_y * src->width);
XcursorPixel *dest_row = dest->pixels + dest_y * dest->width; XcursorPixel *dest_row = dest->pixels + (dest_y * dest->width);
for (dest_x = 0; dest_x < dest->width; dest_x++) for (dest_x = 0; dest_x < dest->width; dest_x++)
{ {
int src_x = dest_x / scale; XcursorDim src_x = (XcursorDim) (dest_x / scale);
dest_row[dest_x] = src_row[src_x]; dest_row[dest_x] = src_row[src_x];
} }
} }
@ -676,7 +676,7 @@ XcursorXcFileLoadImage (XcursorFile *file, int size)
image = _XcursorReadImage (file, fileHeader, toc); image = _XcursorReadImage (file, fileHeader, toc);
_XcursorFileHeaderDestroy (fileHeader); _XcursorFileHeaderDestroy (fileHeader);
if (image->size != size) if (image->size != (XcursorDim) size)
{ {
XcursorImage *resized_image = _XcursorResizeImage (image, size); XcursorImage *resized_image = _XcursorResizeImage (image, size);
if (!resized_image) if (!resized_image)
@ -727,14 +727,14 @@ XcursorXcFileLoadImages (XcursorFile *file, int size)
toc); toc);
if (!image) if (!image)
break; break;
if (image->size != size) if (image->size != (XcursorDim) size)
{ {
XcursorImage *resized_image = _XcursorResizeImage (image, size); XcursorImage *resized_image = _XcursorResizeImage (image, size);
if (!resized_image) if (!resized_image)
{ {
XcursorImageDestroy (image); XcursorImageDestroy (image);
break; break;
} }
XcursorImageDestroy (image); XcursorImageDestroy (image);
image = resized_image; image = resized_image;
} }