goulash-lover
/
legacy-imlib2
forked from old/legacy-imlib2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename/add byte swap macros

This commit is contained in:
Kim Woelders 2019-10-11 15:28:53 +02:00
parent 77cae4cc86
commit 450463521f
3 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/common.h
View File

@ -27,11 +27,15 @@
(((x) & 0xff00 ) >> 8))
#ifdef WORDS_BIGENDIAN
#define SWAP_LE_16(x) x = SWAP16(x)
#define SWAP_LE_32(x) x = SWAP32(x)
#define SWAP_LE_16(x) SWAP16(x)
#define SWAP_LE_32(x) SWAP32(x)
#define SWAP_LE_16_INPLACE(x) x = SWAP16(x)
#define SWAP_LE_32_INPLACE(x) x = SWAP32(x)
#else
#define SWAP_LE_16(x)
#define SWAP_LE_32(x)
#define SWAP_LE_16(x) (x)
#define SWAP_LE_32(x) (x)
#define SWAP_LE_16_INPLACE(x)
#define SWAP_LE_32_INPLACE(x)
#endif
#define PIXEL_ARGB(a, r, g, b) ((a) << 24) | ((r) << 16) | ((g) << 8) | (b)

4
src/modules/loaders/loader_argb.c
View File

@ -64,7 +64,7 @@ load(ImlibImage * im, ImlibProgressFunction progress,
}
#ifdef WORDS_BIGENDIAN
for (l = 0; l < im->w; l++)
SWAP_LE_32(ptr[l]);
SWAP_LE_32_INPLACE(ptr[l]);
#endif
ptr += im->w;
if (progress)
@ -121,7 +121,7 @@ save(ImlibImage * im, ImlibProgressFunction progress, char progress_granularity)
memcpy(buf, ptr, im->w * 4);
for (x = 0; x < im->w; x++)
SWAP_LE_32(buf[x]);
SWAP_LE_32_INPLACE(buf[x]);
fwrite(buf, im->w, 4, f);
}
#else

38
src/modules/loaders/loader_ico.c
View File

@ -106,11 +106,11 @@ ico_read_idir(ico_t * ico, int ino)
ie->w = (ie->ide.width > 0) ? ie->ide.width : 256;
ie->h = (ie->ide.height > 0) ? ie->ide.height : 256;
SWAP_LE_16(ie->ide.planes);
SWAP_LE_16(ie->ide.bpp);
SWAP_LE_16_INPLACE(ie->ide.planes);
SWAP_LE_16_INPLACE(ie->ide.bpp);
SWAP_LE_32(ie->ide.size);
SWAP_LE_32(ie->ide.offs);
SWAP_LE_32_INPLACE(ie->ide.size);
SWAP_LE_32_INPLACE(ie->ide.offs);
D("Entry %2d: Idir: WxHxD = %dx%dx%d, colors = %d\n",
ino, ie->w, ie->h, ie->ide.bpp, ie->ide.colors);
@ -129,19 +129,19 @@ ico_read_icon(ico_t * ico, int ino)
if (nr != sizeof(ie->bih))
goto bail;
SWAP_LE_32(ie->bih.header_size);
SWAP_LE_32(ie->bih.width);
SWAP_LE_32(ie->bih.height);
SWAP_LE_32_INPLACE(ie->bih.header_size);
SWAP_LE_32_INPLACE(ie->bih.width);
SWAP_LE_32_INPLACE(ie->bih.height);
SWAP_LE_32(ie->bih.planes);
SWAP_LE_32(ie->bih.bpp);
SWAP_LE_32_INPLACE(ie->bih.planes);
SWAP_LE_32_INPLACE(ie->bih.bpp);
SWAP_LE_32(ie->bih.compression);
SWAP_LE_32(ie->bih.size);
SWAP_LE_32(ie->bih.res_hor);
SWAP_LE_32(ie->bih.res_ver);
SWAP_LE_32(ie->bih.colors);
SWAP_LE_32(ie->bih.colors_important);
SWAP_LE_32_INPLACE(ie->bih.compression);
SWAP_LE_32_INPLACE(ie->bih.size);
SWAP_LE_32_INPLACE(ie->bih.res_hor);
SWAP_LE_32_INPLACE(ie->bih.res_ver);
SWAP_LE_32_INPLACE(ie->bih.colors);
SWAP_LE_32_INPLACE(ie->bih.colors_important);
if (ie->bih.header_size != 40)
{
@ -175,7 +175,7 @@ ico_read_icon(ico_t * ico, int ino)
goto bail;
#ifdef WORDS_BIGENDIAN
for (nr = 0; nr < ie->bih.colors; nr++)
SWAP_LE_32(ie->cmap[nr]);
SWAP_LE_32_INPLACE(ie->cmap[nr]);
#endif
break;
default:
@ -220,9 +220,9 @@ ico_read(char *filename)
if (nr != sizeof(ico->idir))
goto bail;
SWAP_LE_16(ico->idir.rsvd);
SWAP_LE_16(ico->idir.type);
SWAP_LE_16(ico->idir.icons);
SWAP_LE_16_INPLACE(ico->idir.rsvd);
SWAP_LE_16_INPLACE(ico->idir.type);
SWAP_LE_16_INPLACE(ico->idir.icons);
if (ico->idir.rsvd != 0 ||
(ico->idir.type != 1 && ico->idir.type != 2) || ico->idir.icons <= 0)