Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed issue #28 (again)

  • Loading branch information...
commit ac4eb5302943a4c086445fa5efd41ff66851505f 1 parent c4007be
Bert Münnich authored
Showing with 15 additions and 11 deletions.
  1. +1 −1  Makefile
  2. +8 −6 image.c
  3. +6 −4 thumbs.c
2  Makefile
View
@@ -1,4 +1,4 @@
-VERSION = git-20111111
+VERSION = git-20111113
CC = gcc
CFLAGS = -ansi -Wall -pedantic -O2
14 image.c
View
@@ -311,16 +311,18 @@ bool img_load(img_t *img, const fileinfo_t *file) {
imlib_image_set_changes_on_disk();
imlib_context_set_anti_alias(img->aa);
- if ((fmt = imlib_image_format()) != NULL) {
+ if ((fmt = imlib_image_format()) == NULL) {
+ warn("could not open image: %s", file->name);
+ return false;
+ }
#if EXIF_SUPPORT
- if (STREQ(fmt, "jpeg"))
- exif_auto_orientate(file);
+ if (STREQ(fmt, "jpeg"))
+ exif_auto_orientate(file);
#endif
#if GIF_SUPPORT
- if (STREQ(fmt, "gif"))
- img_load_gif(img, file);
+ if (STREQ(fmt, "gif"))
+ img_load_gif(img, file);
#endif
- }
img->w = imlib_image_get_width();
img->h = imlib_image_get_height();
10 thumbs.c
View
@@ -253,10 +253,12 @@ bool tns_load(tns_t *tns, int n, const fileinfo_t *file,
imlib_context_set_image(im);
imlib_context_set_anti_alias(1);
- fmt = imlib_image_format();
- /* avoid unused-but-set-variable warning */
- (void) fmt;
-
+ if ((fmt = imlib_image_format()) == NULL) {
+ if (!silent)
+ warn("could not open image: %s", file->name);
+ imlib_free_image_and_decache();
+ return false;
+ }
#if EXIF_SUPPORT
if (!cache_hit && STREQ(fmt, "jpeg"))
exif_auto_orientate(file);
Please sign in to comment.
Something went wrong with that request. Please try again.