kwo pushed a commit to branch master.
http://git.enlightenment.org/legacy/imlib2.git/commit/?id=cd1a42dd079d35f141ae8bfcf3f6db991cfad984
commit cd1a42dd079d35f141ae8bfcf3f6db991cfad984
Author: Kim Woelders <k...@woelders.dk>
Date: Sun Apr 11 17:40:13 2021 +0200
Fix clang-analyzer warnings - loaders (trivial)
---
src/modules/loaders/loader_argb.c | 2 --
src/modules/loaders/loader_bmp.c | 4 +---
src/modules/loaders/loader_gif.c | 2 +-
src/modules/loaders/loader_id3.c | 2 --
src/modules/loaders/loader_jpeg.c | 6 +++---
src/modules/loaders/loader_png.c | 8 +++++---
src/modules/loaders/loader_tiff.c | 4 ++--
src/modules/loaders/loader_xpm.c | 3 +--
8 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/modules/loaders/loader_argb.c
b/src/modules/loaders/loader_argb.c
index b915b7b..c40022c 100644
--- a/src/modules/loaders/loader_argb.c
+++ b/src/modules/loaders/loader_argb.c
@@ -92,8 +92,6 @@ save(ImlibImage * im, ImlibProgressFunction progress, char
progress_granularity)
if (!f)
return LOAD_FAIL;
- rc = LOAD_FAIL;
-
if (im->flags & F_HAS_ALPHA)
alpha = 1;
diff --git a/src/modules/loaders/loader_bmp.c b/src/modules/loaders/loader_bmp.c
index 825eeb9..62a501e 100644
--- a/src/modules/loaders/loader_bmp.c
+++ b/src/modules/loaders/loader_bmp.c
@@ -195,8 +195,6 @@ load2(ImlibImage * im, int load_data)
if (fread(&bih.header_size + 1, bih.header_size - 4, 1, im->fp) != 1)
goto quit;
- w = h = 0;
- bitcount = 0;
comp = BI_RGB;
amask = rmask = gmask = bmask = 0;
ashift1 = rshift1 = gshift1 = bshift1 = 0;
@@ -218,7 +216,7 @@ load2(ImlibImage * im, int load_data)
// planes = SWAP_LE_16(bih.bih.planes);
bitcount = SWAP_LE_16(bih.bih.bpp);
comp = SWAP_LE_32(bih.bih.compression);
- imgsize = SWAP_LE_32(bih.bih.size); /* We don't use this */
+// imgsize = SWAP_LE_32(bih.bih.size); /* We don't use this */
if (bih.header_size >= 40 &&
(comp == BI_BITFIELDS || comp == BI_ALPHABITFIELDS))
diff --git a/src/modules/loaders/loader_gif.c b/src/modules/loaders/loader_gif.c
index d012bf2..eee4463 100644
--- a/src/modules/loaders/loader_gif.c
+++ b/src/modules/loaders/loader_gif.c
@@ -57,7 +57,7 @@ load2(ImlibImage * im, int load_data)
if (!IMAGE_DIMENSIONS_OK(w, h))
goto quit;
- rows = calloc(h, sizeof(GifRowType *));
+ rows = calloc(h, sizeof(GifRowType));
if (!rows)
goto quit;
diff --git a/src/modules/loaders/loader_id3.c b/src/modules/loaders/loader_id3.c
index 803c966..34e8ff1 100644
--- a/src/modules/loaders/loader_id3.c
+++ b/src/modules/loaders/loader_id3.c
@@ -591,8 +591,6 @@ load2(ImlibImage * im, int load_data)
}
#endif
- res = LOAD_SUCCESS;
-
fail_context:
if (opt.ctx)
context_delref(opt.ctx);
diff --git a/src/modules/loaders/loader_jpeg.c
b/src/modules/loaders/loader_jpeg.c
index 4f009a6..c9dad29 100644
--- a/src/modules/loaders/loader_jpeg.c
+++ b/src/modules/loaders/loader_jpeg.c
@@ -122,10 +122,11 @@ load2(ImlibImage * im, int load_data)
scans = cinfo.rec_outbuf_height;
if ((h - l) < scans)
scans = h - l;
- ptr = jdata.data;
for (y = 0; y < scans; y++)
{
+ ptr = line[y];
+
switch (cinfo.out_color_space)
{
default:
@@ -162,11 +163,10 @@ load2(ImlibImage * im, int load_data)
if (im->lc && __imlib_LoadProgressRows(im, l, scans))
{
rc = LOAD_BREAK;
- goto done;
+ goto quit;
}
}
- done:
jpeg_finish_decompress(&cinfo);
rc = LOAD_SUCCESS;
diff --git a/src/modules/loaders/loader_png.c b/src/modules/loaders/loader_png.c
index 5e90b33..d216dc9 100644
--- a/src/modules/loaders/loader_png.c
+++ b/src/modules/loaders/loader_png.c
@@ -205,6 +205,7 @@ save(ImlibImage * im, ImlibProgressFunction progress, char
progress_granularity)
ImlibImageTag *tag;
int quality = 75, compression = 3;
int pass, n_passes = 1;
+ int has_alpha;
f = fopen(im->real_file, "wb");
if (!f)
@@ -235,7 +236,8 @@ save(ImlibImage * im, ImlibProgressFunction progress, char
progress_granularity)
}
png_init_io(png_ptr, f);
- if (im->flags & F_HAS_ALPHA)
+ has_alpha = IMAGE_HAS_ALPHA(im);
+ if (has_alpha)
{
png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8,
PNG_COLOR_TYPE_RGB_ALPHA, interlace,
@@ -251,7 +253,7 @@ save(ImlibImage * im, ImlibProgressFunction progress, char
progress_granularity)
png_set_IHDR(png_ptr, info_ptr, im->w, im->h, 8, PNG_COLOR_TYPE_RGB,
interlace, PNG_COMPRESSION_TYPE_BASE,
PNG_FILTER_TYPE_BASE);
- data = malloc(im->w * 3 * sizeof(char));
+ data = malloc(im->w * 3 * sizeof(png_byte));
}
sig_bit.red = 8;
sig_bit.green = 8;
@@ -309,7 +311,7 @@ save(ImlibImage * im, ImlibProgressFunction progress, char
progress_granularity)
for (y = 0; y < im->h; y++)
{
- if (im->flags & F_HAS_ALPHA)
+ if (has_alpha)
row_ptr = (png_bytep) ptr;
else
{
diff --git a/src/modules/loaders/loader_tiff.c
b/src/modules/loaders/loader_tiff.c
index 9cb3038..9411fe6 100644
--- a/src/modules/loaders/loader_tiff.c
+++ b/src/modules/loaders/loader_tiff.c
@@ -69,8 +69,8 @@ raster(TIFFRGBAImage_Extra * img, uint32 * rast,
/* I don't understand why, but that seems to be what's going on. */
/* libtiff needs better docs! */
- if (img->rgba.alpha == EXTRASAMPLE_UNASSALPHA)
- alpha_premult = 1;
+ alpha_premult = img->rgba.alpha == EXTRASAMPLE_UNASSALPHA;
+
switch (img->rgba.orientation)
{
default:
diff --git a/src/modules/loaders/loader_xpm.c b/src/modules/loaders/loader_xpm.c
index 727addb..de2dc38 100644
--- a/src/modules/loaders/loader_xpm.c
+++ b/src/modules/loaders/loader_xpm.c
@@ -111,7 +111,7 @@ xpm_cmap_lookup(const cmap_t * cmap, int nc, int cpp, const
char *s)
{
int i, i1, i2, x;
- i1 = i = 0;
+ i1 = 0;
i2 = nc - 1;
while (i1 < i2)
{
@@ -157,7 +157,6 @@ load2(ImlibImage * im, int load_data)
rewind(im->fp);
- i = 0;
j = 0;
w = 10;
h = 10;
--
