Fix #1227: webp images load as black even with every prerequisite being green during...

[geeqie.git] / src / thumb-standard.h

diff --git a/src/thumb-standard.h b/src/thumb-standard.h
index b6741d7..0c31ab7 100644 (file)
--- a/src/thumb-standard.h
+++ b/src/thumb-standard.h
@@ -22,6 +22,8 @@
 #ifndef THUMB_STANDARD_H
 #define THUMB_STANDARD_H
 
+struct FileData;
+struct ImageLoader;
 
 #if GLIB_CHECK_VERSION (2, 34, 0)
 #define THUMB_FOLDER_GLOBAL "thumbnails"
@@ -35,10 +37,7 @@
 #define THUMB_NAME_EXTENSION ".png"
 
 
-typedef struct _ThumbLoaderStd ThumbLoaderStd;
-typedef void (* ThumbLoaderStdFunc)(ThumbLoaderStd *tl, gpointer data);
-
-struct _ThumbLoaderStd
+struct ThumbLoaderStd
 {
        gboolean standard_loader;
 
@@ -65,9 +64,10 @@ struct _ThumbLoaderStd
 
        gdouble progress;
 
-       ThumbLoaderStdFunc func_done;
-       ThumbLoaderStdFunc func_error;
-       ThumbLoaderStdFunc func_progress;
+       using Func = void (*)(ThumbLoaderStd *, gpointer);
+       Func func_done;
+       Func func_error;
+       Func func_progress;
 
        gpointer data;
 };
@@ -75,9 +75,9 @@ struct _ThumbLoaderStd
 
 ThumbLoaderStd *thumb_loader_std_new(gint width, gint height);
 void thumb_loader_std_set_callbacks(ThumbLoaderStd *tl,
-                                   ThumbLoaderStdFunc func_done,
-                                   ThumbLoaderStdFunc func_error,
-                                   ThumbLoaderStdFunc func_progress,
+                                   ThumbLoaderStd::Func func_done,
+                                   ThumbLoaderStd::Func func_error,
+                                   ThumbLoaderStd::Func func_progress,
                                    gpointer data);
 void thumb_loader_std_set_cache(ThumbLoaderStd *tl, gboolean enable_cache, gboolean local, gboolean retry_failed);
 gboolean thumb_loader_std_start(ThumbLoaderStd *tl, FileData *fd);
@@ -93,7 +93,7 @@ void thumb_loader_std_calibrate_pixbuf(FileData *fd, GdkPixbuf *pixbuf);
  * calling func_valid with the information when app is idle
  * for thumbnail's without a file: uri, validates against allowed_age in days
  */
-ThumbLoaderStd *thumb_loader_std_thumb_file_validate(const gchar *thumb_path, gint allowed_age,
+ThumbLoaderStd *thumb_loader_std_thumb_file_validate(const gchar *thumb_path, gint allowed_days,
                                                     void (*func_valid)(const gchar *path, gboolean valid, gpointer data),
                                                     gpointer data);
 void thumb_loader_std_thumb_file_validate_cancel(ThumbLoaderStd *tl);