old
/
legacy-imlib2
3
0
Fork 4
Code Issues 1 Pull Requests Projects Releases Wiki Activity

loaders: Fix build with -m32 --enable-debug

This commit is contained in:
Kim Woelders 2023-09-03 11:32:10 +02:00
parent 687e13b290
commit 1e5040e8e7
6 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/loaders/loader_ani.c
View File

@ -88,7 +88,7 @@ _load_embedded(ImlibImage * im, int load_data, const char *data,
return rc;
}
#define OFFS(p) ((const char*)(p) - (const char*)im->fi->fdata)
#define OFFS(p) (long)((const char*)(p) - (const char*)im->fi->fdata)
static int
_riff_parse(ImlibImage * im, riff_ctx_t * ctx, const char *fdata,

6
src/modules/loaders/loader_j2k.c
View File

@ -53,7 +53,7 @@ mm_init(const void *src, unsigned int size)
static OPJ_SIZE_T
mm_read(void *dst, OPJ_SIZE_T len, void *data)
{
DL("%s: len=%ld\n", __func__, len);
DL("%s: len=%ld\n", __func__, (long)len);
if (mdata.dptr >= mdata.data + mdata.size)
return -1; /* Out of data */
@ -69,7 +69,7 @@ mm_read(void *dst, OPJ_SIZE_T len, void *data)
static OPJ_OFF_T
mm_seek_cur(OPJ_OFF_T offs, void *data)
{
DL("%s: offs=%ld\n", __func__, offs);
DL("%s: offs=%ld\n", __func__, (long)offs);
if (mdata.dptr + offs > mdata.data + mdata.size)
return 0; /* Out of data */
@ -82,7 +82,7 @@ mm_seek_cur(OPJ_OFF_T offs, void *data)
static OPJ_BOOL
mm_seek_set(OPJ_OFF_T offs, void *data)
{
DL("%s: offs=%ld\n", __func__, offs);
DL("%s: offs=%ld\n", __func__, (long)offs);
if (offs > mdata.size)
return OPJ_FALSE; /* Out of data */

3
src/modules/loaders/loader_jpeg.c
View File

@ -191,7 +191,8 @@ _load(ImlibImage * im, int load_data)
break;
}
DL("l,s,y=%d,%d, %d - x,y=%4ld,%4ld\n", l, y, l + y,
(imdata - im->data) % im->w, (imdata - im->data) / im->w);
(long)((imdata - im->data) % im->w),
(long)((imdata - im->data) / im->w));
switch (jds.out_color_space)
{

11
src/modules/loaders/loader_jxl.c
View File

@ -22,7 +22,8 @@ _scanline_cb(void *opaque, size_t x, size_t y,
uint32_t *imdata;
size_t i;
DL("%s: x,y=%ld,%ld len=%lu\n", __func__, x, y, num_pixels);
DL("%s: x,y=%ld,%ld len=%lu\n", __func__,
(long)x, (long)y, (long)num_pixels);
imdata = im->data + (im->w * y) + x;
@ -52,7 +53,7 @@ _load(ImlibImage * im, int load_data)
ImlibImageFrame *pf;
#if MAX_RUNNERS > 0
size_t n_runners;
unsigned int n_runners;
JxlParallelRunner *runner = NULL;
#endif
@ -80,7 +81,7 @@ _load(ImlibImage * im, int load_data)
n_runners = JxlThreadParallelRunnerDefaultNumWorkerThreads();
if (n_runners > MAX_RUNNERS)
n_runners = MAX_RUNNERS;
D("n_runners = %ld\n", n_runners);
D("n_runners = %d\n", n_runners);
runner = JxlThreadParallelRunnerCreate(NULL, n_runners);
if (!runner)
goto quit;
@ -235,7 +236,7 @@ _save(ImlibImage * im)
size_t buf_len, i, npix;
#if MAX_RUNNERS > 0
size_t n_runners;
unsigned int n_runners;
JxlParallelRunner *runner = NULL;
#endif
@ -249,7 +250,7 @@ _save(ImlibImage * im)
n_runners = JxlThreadParallelRunnerDefaultNumWorkerThreads();
if (n_runners > MAX_RUNNERS)
n_runners = MAX_RUNNERS;
D("n_runners = %ld\n", n_runners);
D("n_runners = %d\n", n_runners);
runner = JxlThreadParallelRunnerCreate(NULL, n_runners);
if (!runner)
goto quit;

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

@ -348,7 +348,7 @@ _load(ImlibImage * im, int load_data)
len = htonl(chunk->hdr.len);
D("Scan %3d: %06lx: %6d: %.4s: ", ic++,
fptr - (unsigned char *)im->fi->fdata, len, chunk->hdr.name);
(long)(fptr - (unsigned char *)im->fi->fdata), len, chunk->hdr.name);
if (!mm_check(fptr + len))
break;
@ -440,7 +440,7 @@ _load(ImlibImage * im, int load_data)
len = htonl(chunk->hdr.len);
D("Chunk %3d: %06lx: %6d: %.4s: ", ic++,
fptr - (unsigned char *)im->fi->fdata, len, chunk->hdr.name);
(long)(fptr - (unsigned char *)im->fi->fdata), len, chunk->hdr.name);
if (!mm_check(fptr + len))
break;

6
src/modules/loaders/loader_tiff.c
View File

@ -25,7 +25,7 @@ mm_init(const void *src, unsigned int size)
static tmsize_t
_tiff_read(thandle_t ctx, void *buf, tmsize_t len)
{
DD("%s: len=%ld\n", __func__, len);
DD("%s: len=%ld\n", __func__, (long)len);
if (mdata.dptr + len > mdata.data + mdata.size)
return 0; /* Out of data */
@ -39,7 +39,7 @@ _tiff_read(thandle_t ctx, void *buf, tmsize_t len)
static tmsize_t
_tiff_write(thandle_t ctx, void *buf, tmsize_t len)
{
DD("%s: len=%ld\n", __func__, len);
DD("%s: len=%ld\n", __func__, (long)len);
return 0;
}
@ -49,7 +49,7 @@ _tiff_seek(thandle_t ctx, toff_t offs, int whence)
{
const unsigned char *dptr;
DD("%s: offs=%ld, whence=%d\n", __func__, offs, whence);
DD("%s: offs=%ld, whence=%d\n", __func__, (long)offs, whence);
switch (whence)
{