kwo pushed a commit to branch master.
http://git.enlightenment.org/legacy/imlib2.git/commit/?id=868a40579a4cf00623a75638c93fc5970cd84b09
commit 868a40579a4cf00623a75638c93fc5970cd84b09
Author: Kim Woelders <k...@woelders.dk>
Date: Sat May 5 17:20:01 2018 +0200
Cleanups in load() functions
When entering load we can assume that im != NULL and im->data == NULL.
---
src/modules/loaders/loader_argb.c | 2 --
src/modules/loaders/loader_bmp.c | 2 --
src/modules/loaders/loader_bz2.c | 3 ---
src/modules/loaders/loader_ff.c | 41 ++++++++++++++++++---------------------
src/modules/loaders/loader_gif.c | 5 -----
src/modules/loaders/loader_id3.c | 2 --
src/modules/loaders/loader_jpeg.c | 2 --
src/modules/loaders/loader_lbm.c | 6 ------
src/modules/loaders/loader_png.c | 4 ----
src/modules/loaders/loader_pnm.c | 2 --
src/modules/loaders/loader_tga.c | 3 ---
src/modules/loaders/loader_tiff.c | 3 ---
src/modules/loaders/loader_xpm.c | 8 --------
src/modules/loaders/loader_zlib.c | 3 ---
14 files changed, 19 insertions(+), 67 deletions(-)
diff --git a/src/modules/loaders/loader_argb.c
b/src/modules/loaders/loader_argb.c
index 4c1bc81..b3168b7 100644
--- a/src/modules/loaders/loader_argb.c
+++ b/src/modules/loaders/loader_argb.c
@@ -13,8 +13,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
int w = 0, h = 0, alpha = 0;
FILE *f;
- if (im->data)
- return 0;
f = fopen(im->real_file, "rb");
if (!f)
return 0;
diff --git a/src/modules/loaders/loader_bmp.c b/src/modules/loaders/loader_bmp.c
index d7c8ba8..15bcd11 100644
--- a/src/modules/loaders/loader_bmp.c
+++ b/src/modules/loaders/loader_bmp.c
@@ -128,8 +128,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
*/
unsigned char byte1, byte2;
- if (im->data)
- return 0;
f = fopen(im->real_file, "rb");
if (!f)
return 0;
diff --git a/src/modules/loaders/loader_bz2.c b/src/modules/loaders/loader_bz2.c
index 6b9b656..b3e3aba 100644
--- a/src/modules/loaders/loader_bz2.c
+++ b/src/modules/loaders/loader_bz2.c
@@ -3,7 +3,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <assert.h>
#define OUTBUF_SIZE 16384
#define INBUF_SIZE 1024
@@ -55,8 +54,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
char *file, *p, *q, tmp[] = "/tmp/imlib2_loader_bz2-XXXXXX";
char *real_ext;
- assert(im);
-
/* make sure this file ends in ".bz2" and that there's another ext
* (e.g. "foo.png.bz2"
*/
diff --git a/src/modules/loaders/loader_ff.c b/src/modules/loaders/loader_ff.c
index 267a9cb..f92f2fc 100644
--- a/src/modules/loaders/loader_ff.c
+++ b/src/modules/loaders/loader_ff.c
@@ -23,35 +23,32 @@ load(ImlibImage * im, ImlibProgressFunction progress,
}
/* read and check the header */
- if (!im->data)
+ if (fread(hdr, sizeof(uint32_t), LEN(hdr), f) != LEN(hdr) ||
+ memcmp("farbfeld", hdr, sizeof("farbfeld") - 1))
{
- if (fread(hdr, sizeof(uint32_t), LEN(hdr), f) != LEN(hdr) ||
- memcmp("farbfeld", hdr, sizeof("farbfeld") - 1))
- {
- fclose(f);
- return 0;
- }
- im->w = ntohl(hdr[2]);
- im->h = ntohl(hdr[3]);
- if (!IMAGE_DIMENSIONS_OK(im->w, im->h))
+ fclose(f);
+ return 0;
+ }
+ im->w = ntohl(hdr[2]);
+ im->h = ntohl(hdr[3]);
+ if (!IMAGE_DIMENSIONS_OK(im->w, im->h))
+ {
+ im->w = 0;
+ fclose(f);
+ return 0;
+ }
+
+ /* set format */
+ if (!im->loader)
+ {
+ if (!(im->format = strdup("ff")))
{
im->w = 0;
fclose(f);
return 0;
}
-
- /* set format */
- if (!im->loader)
- {
- if (!(im->format = strdup("ff")))
- {
- im->w = 0;
- fclose(f);
- return 0;
- }
- }
- SET_FLAG(im->flags, F_HAS_ALPHA);
}
+ SET_FLAG(im->flags, F_HAS_ALPHA);
/* load the data */
if (im->loader || immediate_load || progress)
diff --git a/src/modules/loaders/loader_gif.c b/src/modules/loaders/loader_gif.c
index 036ee93..aa67c77 100644
--- a/src/modules/loaders/loader_gif.c
+++ b/src/modules/loaders/loader_gif.c
@@ -26,11 +26,6 @@ load(ImlibImage * im, ImlibProgressFunction progress, char
progress_granularity,
rows = NULL;
transp = -1;
- /* if immediate_load is 1, then dont delay image laoding as below, or */
- /* already data in this image - dont load it again */
- if (im->data)
- return 0;
-
fd = open(im->real_file, O_RDONLY);
if (fd < 0)
return 0;
diff --git a/src/modules/loaders/loader_id3.c b/src/modules/loaders/loader_id3.c
index 0b4f215..65a4f73 100644
--- a/src/modules/loaders/loader_id3.c
+++ b/src/modules/loaders/loader_id3.c
@@ -2,7 +2,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <assert.h>
#include <errno.h>
#include <limits.h>
#include <id3tag.h>
@@ -496,7 +495,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
int res;
struct stat st;
- assert(im);
if (stat(im->real_file, &st) < 0)
return 0;
if (!get_options(&opt, im))
diff --git a/src/modules/loaders/loader_jpeg.c
b/src/modules/loaders/loader_jpeg.c
index 72e9034..a6674b7 100644
--- a/src/modules/loaders/loader_jpeg.c
+++ b/src/modules/loaders/loader_jpeg.c
@@ -51,8 +51,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
struct ImLib_JPEG_error_mgr jerr;
FILE *f;
- if (im->data)
- return 0;
f = fopen(im->real_file, "rb");
if (!f)
return 0;
diff --git a/src/modules/loaders/loader_lbm.c b/src/modules/loaders/loader_lbm.c
index 617c602..cdc87f6 100644
--- a/src/modules/loaders/loader_lbm.c
+++ b/src/modules/loaders/loader_lbm.c
@@ -458,12 +458,6 @@ load(ImlibImage * im, ImlibProgressFunction progress, char
progress_granularity,
ILBM ilbm;
/*----------
- * Do nothing if the data is already loaded.
- *----------*/
- if (im->data)
- return 0;
-
- /*----------
* Load the chunk(s) we're interested in. If full is not true, then we only
* want the image size and format.
*----------*/
diff --git a/src/modules/loaders/loader_png.c b/src/modules/loaders/loader_png.c
index 32b669f..be50320 100644
--- a/src/modules/loaders/loader_png.c
+++ b/src/modules/loaders/loader_png.c
@@ -24,10 +24,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
png_infop info_ptr = NULL;
int bit_depth, color_type, interlace_type;
- /* if immediate_load is 1, then don't delay image loading as below, or */
- /* already data in this image - don't load it again */
- if (im->data)
- return 0;
f = fopen(im->real_file, "rb");
if (!f)
return 0;
diff --git a/src/modules/loaders/loader_pnm.c b/src/modules/loaders/loader_pnm.c
index 9e4a2b4..6856a26 100644
--- a/src/modules/loaders/loader_pnm.c
+++ b/src/modules/loaders/loader_pnm.c
@@ -36,8 +36,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
char buf[256];
FILE *f = NULL;
- if (im->data)
- return 0;
f = fopen(im->real_file, "rb");
if (!f)
return 0;
diff --git a/src/modules/loaders/loader_tga.c b/src/modules/loaders/loader_tga.c
index fe6165d..224a924 100644
--- a/src/modules/loaders/loader_tga.c
+++ b/src/modules/loaders/loader_tga.c
@@ -201,9 +201,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
tga_header *header;
tga_footer *footer;
- if (im->data)
- return 0;
-
fd = open(im->real_file, O_RDONLY);
if (fd < 0)
return 0;
diff --git a/src/modules/loaders/loader_tiff.c
b/src/modules/loaders/loader_tiff.c
index f9c771a..13669e2 100644
--- a/src/modules/loaders/loader_tiff.c
+++ b/src/modules/loaders/loader_tiff.c
@@ -271,9 +271,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
ok = 0;
- if (im->data)
- return 0;
-
file = fopen(im->real_file, "rb");
if (!file)
return 0;
diff --git a/src/modules/loaders/loader_xpm.c b/src/modules/loaders/loader_xpm.c
index 0a8e512..ac5458e 100644
--- a/src/modules/loaders/loader_xpm.c
+++ b/src/modules/loaders/loader_xpm.c
@@ -111,14 +111,6 @@ load(ImlibImage * im, ImlibProgressFunction progress, char
progress_granularity,
done = 0;
transp = -1;
- /* if immediate_load is 1, then dont delay image laoding as below, or */
- /* already data in this image - dont load it again */
-
- if (im->data)
- {
- xpm_parse_done();
- return 0;
- }
f = fopen(im->real_file, "rb");
if (!f)
{
diff --git a/src/modules/loaders/loader_zlib.c
b/src/modules/loaders/loader_zlib.c
index 9b03f8f..29c39a0 100644
--- a/src/modules/loaders/loader_zlib.c
+++ b/src/modules/loaders/loader_zlib.c
@@ -3,7 +3,6 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <assert.h>
#define OUTBUF_SIZE 16484
@@ -48,8 +47,6 @@ load(ImlibImage * im, ImlibProgressFunction progress,
char *real_ext;
struct stat st;
- assert(im);
-
/* check that this file ends in *.gz and that there's another ext
* (e.g. "foo.png.gz"
*/
--
