Use util_clip_triangle() in pan_item_tri_new()

[geeqie.git] / src / cache.h

diff --git a/src/cache.h b/src/cache.h
index 83c094a..94f7148 100644 (file)
--- a/src/cache.h
+++ b/src/cache.h
@@ -22,9 +22,11 @@
 #ifndef CACHE_H
 #define CACHE_H
 
+#include <sys/types.h>
 
-#include "similar.h"
+#include <glib.h>
 
+struct ImageSimilarityData;
 
 #define GQ_CACHE_THUMB         "thumbnails"
 #define GQ_CACHE_METADATA      "metadata"
@@ -38,15 +40,14 @@
 #define GQ_CACHE_EXT_XMP_METADATA   ".gq.xmp"
 
 
-typedef enum {
+enum CacheType {
        CACHE_TYPE_THUMB,
        CACHE_TYPE_SIM,
        CACHE_TYPE_METADATA,
        CACHE_TYPE_XMP_METADATA
-} CacheType;
+};
 
-typedef struct _CacheData CacheData;
-struct _CacheData
+struct CacheData
 {
        gchar *path;
        gint width;
@@ -64,23 +65,23 @@ struct _CacheData
 gboolean cache_time_valid(const gchar *cache, const gchar *path);
 
 
-CacheData *cache_sim_data_new(void);
+CacheData *cache_sim_data_new();
 void cache_sim_data_free(CacheData *cd);
 
 gboolean cache_sim_data_save(CacheData *cd);
 CacheData *cache_sim_data_load(const gchar *path);
 
 void cache_sim_data_set_dimensions(CacheData *cd, gint w, gint h);
-void cache_sim_data_set_date(CacheData *cd, time_t date);
-void cache_sim_data_set_md5sum(CacheData *cd, guchar digest[16]);
+void cache_sim_data_set_md5sum(CacheData *cd, const guchar digest[16]);
 void cache_sim_data_set_similarity(CacheData *cd, ImageSimilarityData *sd);
 gint cache_sim_data_filled(ImageSimilarityData *sd);
 
 gchar *cache_get_location(CacheType type, const gchar *source, gint include_name, mode_t *mode);
 gchar *cache_find_location(CacheType type, const gchar *source);
 
-const gchar *get_thumbnails_cache_dir(void);
-const gchar *get_metadata_cache_dir(void);
+const gchar *get_thumbnails_cache_dir();
+const gchar *get_thumbnails_standard_cache_dir();
+const gchar *get_metadata_cache_dir();
 
 #endif
 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */