"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/imlib.c" between
feh-3.4.tar.bz2 and feh-3.4.1.tar.bz2

About: feh is an X11 image viewer aimed mostly at console users.

imlib.c  (feh-3.4.tar.bz2):imlib.c  (feh-3.4.1.tar.bz2)
/* imlib.c /* imlib.c
Copyright (C) 1999-2003 Tom Gilbert. Copyright (C) 1999-2003 Tom Gilbert.
Copyright (C) 2010-2018 Daniel Friesel. Copyright (C) 2010-2020 Daniel Friesel.
Permission is hereby granted, free of charge, to any person obtaining a copy Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to of this software and associated documentation files (the "Software"), to
deal in the Software without restriction, including without limitation the deal in the Software without restriction, including without limitation the
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
sell copies of the Software, and to permit persons to whom the Software is sell copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions: furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in The above copyright notice and this permission notice shall be included in
all copies of the Software and its documentation and acknowledgment shall be all copies of the Software and its documentation and acknowledgment shall be
skipping to change at line 1394 skipping to change at line 1394
w->im_h = tmp; w->im_h = tmp;
if (FEH_FILE(w->file->data)->info) { if (FEH_FILE(w->file->data)->info) {
FEH_FILE(w->file->data)->info->width = w->im_w; FEH_FILE(w->file->data)->info->width = w->im_w;
FEH_FILE(w->file->data)->info->height = w->im_h; FEH_FILE(w->file->data)->info->height = w->im_h;
} }
} }
winwidget_render_image(w, 1, 0); winwidget_render_image(w, 1, 0);
return; return;
} }
if (!strcmp(gib_imlib_image_format(w->im), "jpeg") && // Imlib2 <= 1.5 returns "jpeg", Imlib2 >= 1.6 uses "jpg"
!path_is_url(FEH_FILE(w->file->data)->filename)) { if ((!strcmp(gib_imlib_image_format(w->im), "jpeg")
|| !strcmp(gib_imlib_image_format(w->im), "jpg"))
&& !path_is_url(FEH_FILE(w->file->data)->filename)) {
feh_edit_inplace_lossless(w, op); feh_edit_inplace_lossless(w, op);
feh_reload_image(w, 1, 1); feh_reload_image(w, 1, 1);
return; return;
} }
old = imlib_load_image_with_error_return(FEH_FILE(w->file->data)->filenam e, &err); old = imlib_load_image_with_error_return(FEH_FILE(w->file->data)->filenam e, &err);
if ((old != NULL) && (err == IMLIB_LOAD_ERROR_NONE)) { if ((old != NULL) && (err == IMLIB_LOAD_ERROR_NONE)) {
imlib_context_set_image(old); imlib_context_set_image(old);
if (op == INPLACE_EDIT_FLIP) if (op == INPLACE_EDIT_FLIP)
 End of changes. 2 change blocks. 
3 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)