summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2012-09-12 20:02:52 +0200
committerDaniel Friesel <derf@finalrewind.org>2012-09-12 20:02:52 +0200
commited5b2d5aaf3024d23b131e008d92c7844858373c (patch)
tree0a861e0d330f1ce29567cf83f4083d9593e6045f
parent31c67831736e4bde3ef0d4dedb7c11dfc6649fdf (diff)
Fix lossless rotate error message for non-JPEG images
-rw-r--r--ChangeLog1
-rw-r--r--src/imlib.c6
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ee6bb53..53b6457 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ git HEAD
when running feh on the current working directory, '/path/to/./image.png'
was used for thumbnail name generation. Now it is always
'/path/to/image.png'
+ * Show error message if lossless rotate / flip failed on non-JPEG image
Tue, 28 Aug 2012 11:46:19 +0200 Daniel Friesel <derf+feh@finalrewind.org>
diff --git a/src/imlib.c b/src/imlib.c
index 5e423f3..d89a5a4 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -1000,6 +1000,7 @@ void feh_edit_inplace(winwidget w, int op)
{
int ret;
Imlib_Image old;
+ Imlib_Load_Error err;
if (!w->file || !w->file->data || !FEH_FILE(w->file->data)->filename)
return;
@@ -1019,8 +1020,11 @@ void feh_edit_inplace(winwidget w, int op)
imlib_image_flip_horizontal();
} else
gib_imlib_image_orientate(old, op);
- gib_imlib_save_image(old, FEH_FILE(w->file->data)->filename);
+ ungib_imlib_save_image_with_error_return(old,
+ FEH_FILE(w->file->data)->filename, &err);
gib_imlib_free_image(old);
+ if (err)
+ im_weprintf(w, "Failed to save image after operation");
feh_reload_image(w, 1, 1);
} else {
im_weprintf(w, "failed to load image from disk to edit it in place");