aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNRK <nrk@disroot.org>2023-07-08 09:05:57 +0200
committerNRK <nrk@disroot.org>2023-07-08 09:05:57 +0200
commitc1b36b8f0942a8ec34f97f28c8c77c84adf0c2c4 (patch)
tree015eb4ca8387c3c698896a5c36da2b7b9abdb522
parent9b122c82fac0f27f8fbde22b818cfa8befaaf405 (diff)
downloadnsxiv-c1b36b8f0942a8ec34f97f28c8c77c84adf0c2c4.tar.zst
add some upgrade comments (#457)
these document improvements and/or removal of unnecessary code for when we will require a higher minimum version of Imlib2. all the comments have been prefixed with "UPGRADE: " for easy grepping. Reviewed-on: https://codeberg.org/nsxiv/nsxiv/pulls/457 Reviewed-by: explosion-mental <explosion-mental@noreply.codeberg.org>
-rw-r--r--image.c3
-rw-r--r--nsxiv.h2
-rw-r--r--thumbs.c1
3 files changed, 5 insertions, 1 deletions
diff --git a/image.c b/image.c
index e7e4455..e8fc2a9 100644
--- a/image.c
+++ b/image.c
@@ -563,6 +563,8 @@ Imlib_Image img_open(const fileinfo_t *file)
{
imlib_context_set_image(im);
}
+ /* UPGRADE: Imlib2 v1.10.0: better error reporting with
+ * imlib_get_error() + imlib_strerror() */
if (im == NULL && (file->flags & FF_WARN))
error(0, 0, "%s: Error opening image", file->name);
return im;
@@ -581,6 +583,7 @@ bool img_load(img_t *img, const fileinfo_t *file)
*/
imlib_image_set_changes_on_disk();
+/* UPGRADE: Imlib2 v1.7.5: remove these exif related ifdefs */
/* since v1.7.5, Imlib2 can parse exif orientation from jpeg files.
* this version also happens to be the first one which defines the
* IMLIB2_VERSION macro.
diff --git a/nsxiv.h b/nsxiv.h
index 574ab1a..3ff90b2 100644
--- a/nsxiv.h
+++ b/nsxiv.h
@@ -159,7 +159,7 @@ typedef keymap_t button_t;
/* image.c */
-#ifdef IMLIB2_VERSION
+#ifdef IMLIB2_VERSION /* UPGRADE: Imlib2 v1.8.0: remove all HAVE_IMLIB2_MULTI_FRAME ifdefs */
#if IMLIB2_VERSION >= IMLIB2_VERSION_(1, 8, 0)
#define HAVE_IMLIB2_MULTI_FRAME 1
#endif
diff --git a/thumbs.c b/thumbs.c
index c1778b5..d5a6c6b 100644
--- a/thumbs.c
+++ b/thumbs.c
@@ -268,6 +268,7 @@ bool tns_load(tns_t *tns, int n, bool force, bool cache_only)
char tmppath[] = "/tmp/nsxiv-XXXXXX";
Imlib_Image tmpim;
+ /* UPGRADE: Imlib2 v1.10.0: avoid tempfile and use imlib_load_image_mem() */
if ((ed = exif_data_new_from_file(file->path)) != NULL) {
if (ed->data != NULL && ed->size > 0 &&
(tmpfd = mkstemp(tmppath)) >= 0)