Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactored img_open and img_check

Browse Source
This commit is contained in:
Bert 2011-02-01 16:10:08 +01:00
parent 5a682426b1
commit 1576eb4e17
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
image.c
View File

@ -52,7 +52,7 @@ void img_free(img_t* img) {
imlib_free_image(); imlib_free_image();
} }
int img_check(const char *filename) { int _imlib_load_image(const char *filename) {
Imlib_Image *im; Imlib_Image *im;
if (!filename) if (!filename)
@ -65,28 +65,30 @@ int img_check(const char *filename) {
imlib_context_set_image(im); imlib_context_set_image(im);
imlib_image_set_changes_on_disk(); imlib_image_set_changes_on_disk();
imlib_free_image();
return 1; return 1;
} }
int img_load(img_t *img, const char *filename) { int img_check(const char *filename) {
Imlib_Image *im; int ret;
if ((ret = _imlib_load_image(filename)))
imlib_free_image();
return ret;
}
int img_load(img_t *img, const char *filename) {
if (!img || !filename) if (!img || !filename)
return 0; return 0;
if (imlib_context_get_image()) if (imlib_context_get_image())
imlib_free_image(); imlib_free_image();
if (!(im = imlib_load_image(filename))) { if (!_imlib_load_image(filename))
WARN("could not open image: %s", filename);
return 0; return 0;
}
imlib_context_set_image(im);
imlib_context_set_anti_alias(img->aa); imlib_context_set_anti_alias(img->aa);
imlib_image_set_changes_on_disk();
img->re = 0; img->re = 0;
img->checkpan = 0; img->checkpan = 0;