Remove redundant GdkRGBA memcpy

[geeqie.git] / src / cache-loader.cc

diff --git a/src/cache-loader.cc b/src/cache-loader.cc
index 19b93d0..30f58d8 100644 (file)
--- a/src/cache-loader.cc
+++ b/src/cache-loader.cc
@@ -19,26 +19,28 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
 #include "cache-loader.h"
 
+#include <config.h>
+
 #include "filedata.h"
 #include "metadata.h"
+#include "options.h"
 #include "ui-fileops.h"
 
 
 static gboolean cache_loader_phase2_idle_cb(gpointer data);
 
-static void cache_loader_phase1_done_cb(ImageLoader *UNUSED(il), gpointer data)
+static void cache_loader_phase1_done_cb(ImageLoader *, gpointer data)
 {
-       CacheLoader *cl = static_cast<CacheLoader *>(data);
+       auto cl = static_cast<CacheLoader *>(data);
 
        cl->idle_id = g_idle_add(cache_loader_phase2_idle_cb, cl);
 }
 
-static void cache_loader_phase1_error_cb(ImageLoader *UNUSED(il), gpointer data)
+static void cache_loader_phase1_error_cb(ImageLoader *, gpointer data)
 {
-       CacheLoader *cl = static_cast<CacheLoader *>(data);
+       auto cl = static_cast<CacheLoader *>(data);
 
        cl->error = TRUE;
        cl->idle_id = g_idle_add(cache_loader_phase2_idle_cb, cl);
@@ -56,7 +58,7 @@ static gboolean cache_loader_phase1_process(CacheLoader *cl)
                        g_signal_connect(G_OBJECT(cl->il), "done", (GCallback)cache_loader_phase1_done_cb, cl);
                        if (image_loader_start(cl->il))
                                {
-                               return FALSE;
+                               return G_SOURCE_REMOVE;
                                }
 
                        cl->error = TRUE;
@@ -65,7 +67,7 @@ static gboolean cache_loader_phase1_process(CacheLoader *cl)
 
        cl->idle_id = g_idle_add(cache_loader_phase2_idle_cb, cl);
 
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 static gboolean cache_loader_phase2_process(CacheLoader *cl)
@@ -84,8 +86,8 @@ static gboolean cache_loader_phase2_process(CacheLoader *cl)
                                cache_sim_data_set_similarity(cl->cd, sim);
                                image_sim_free(sim);
 
-                               cl->todo_mask &= ~CACHE_LOADER_SIMILARITY;
-                               cl->done_mask |= CACHE_LOADER_SIMILARITY;
+                               cl->todo_mask = static_cast<CacheDataType>(cl->todo_mask & ~CACHE_LOADER_SIMILARITY);
+                               cl->done_mask = static_cast<CacheDataType>(cl->done_mask | CACHE_LOADER_SIMILARITY);
                                }
 
                        /* we have the dimensions via pixbuf */
@@ -95,16 +97,16 @@ static gboolean cache_loader_phase2_process(CacheLoader *cl)
                                                                      gdk_pixbuf_get_height(pixbuf));
                                if (cl->todo_mask & CACHE_LOADER_DIMENSIONS)
                                        {
-                                       cl->todo_mask &= ~CACHE_LOADER_DIMENSIONS;
-                                       cl->done_mask |= CACHE_LOADER_DIMENSIONS;
+                                       cl->todo_mask = static_cast<CacheDataType>(cl->todo_mask & ~CACHE_LOADER_DIMENSIONS);
+                                       cl->done_mask = static_cast<CacheDataType>(cl->done_mask | CACHE_LOADER_DIMENSIONS);
                                        }
                                }
                        }
 
                image_loader_free(cl->il);
-               cl->il = NULL;
+               cl->il = nullptr;
 
-               cl->todo_mask &= ~CACHE_LOADER_SIMILARITY;
+               cl->todo_mask = static_cast<CacheDataType>(cl->todo_mask & ~CACHE_LOADER_SIMILARITY);
                }
        else if (cl->todo_mask & CACHE_LOADER_DIMENSIONS &&
                 !cl->cd->dimensions)
@@ -113,14 +115,14 @@ static gboolean cache_loader_phase2_process(CacheLoader *cl)
                    image_load_dimensions(cl->fd, &cl->cd->width, &cl->cd->height))
                        {
                        cl->cd->dimensions = TRUE;
-                       cl->done_mask |= CACHE_LOADER_DIMENSIONS;
+                       cl->done_mask = static_cast<CacheDataType>(cl->done_mask | CACHE_LOADER_DIMENSIONS);
                        }
                else
                        {
                        cl->error = TRUE;
                        }
 
-               cl->todo_mask &= ~CACHE_LOADER_DIMENSIONS;
+               cl->todo_mask = static_cast<CacheDataType>(cl->todo_mask & ~CACHE_LOADER_DIMENSIONS);
                }
        else if (cl->todo_mask & CACHE_LOADER_MD5SUM &&
                 !cl->cd->have_md5sum)
@@ -128,14 +130,14 @@ static gboolean cache_loader_phase2_process(CacheLoader *cl)
                if (md5_get_digest_from_file_utf8(cl->fd->path, cl->cd->md5sum))
                        {
                        cl->cd->have_md5sum = TRUE;
-                       cl->done_mask |= CACHE_LOADER_MD5SUM;
+                       cl->done_mask = static_cast<CacheDataType>(cl->done_mask | CACHE_LOADER_MD5SUM);
                        }
                else
                        {
                        cl->error = TRUE;
                        }
 
-               cl->todo_mask &= ~CACHE_LOADER_MD5SUM;
+               cl->todo_mask = static_cast<CacheDataType>(cl->todo_mask & ~CACHE_LOADER_MD5SUM);
                }
        else if (cl->todo_mask & CACHE_LOADER_DATE &&
                 !cl->cd->have_date)
@@ -164,8 +166,8 @@ static gboolean cache_loader_phase2_process(CacheLoader *cl)
                cl->cd->date = date;
                cl->cd->have_date = TRUE;
 
-               cl->done_mask |= CACHE_LOADER_DATE;
-               cl->todo_mask &= ~CACHE_LOADER_DATE;
+               cl->done_mask = static_cast<CacheDataType>(cl->done_mask | CACHE_LOADER_DATE);
+               cl->todo_mask = static_cast<CacheDataType>(cl->todo_mask & ~CACHE_LOADER_DATE);
                }
        else
                {
@@ -180,7 +182,7 @@ static gboolean cache_loader_phase2_process(CacheLoader *cl)
                        if (recursive_mkdir_if_not_exists(base, mode))
                                {
                                g_free(cl->cd->path);
-                               cl->cd->path = cache_get_location(CACHE_TYPE_SIM, cl->fd->path, TRUE, NULL);
+                               cl->cd->path = cache_get_location(CACHE_TYPE_SIM, cl->fd->path, TRUE, nullptr);
                                if (cache_sim_data_save(cl->cd))
                                        {
                                        filetime_set(cl->cd->path, filetime(cl->fd->path));
@@ -196,33 +198,33 @@ static gboolean cache_loader_phase2_process(CacheLoader *cl)
                        cl->done_func(cl, cl->error, cl->done_data);
                        }
 
-               return FALSE;
+               return G_SOURCE_REMOVE;
                }
 
-       return TRUE;
+       return G_SOURCE_CONTINUE;
 }
 
 static gboolean cache_loader_phase1_idle_cb(gpointer data)
 {
-       CacheLoader *cl = static_cast<CacheLoader *>(data);
+       auto cl = static_cast<CacheLoader *>(data);
 
        return cache_loader_phase1_process(cl);
 }
 
 static gboolean cache_loader_phase2_idle_cb(gpointer data)
 {
-       CacheLoader *cl = static_cast<CacheLoader *>(data);
+       auto cl = static_cast<CacheLoader *>(data);
 
        return cache_loader_phase2_process(cl);
 }
 
 CacheLoader *cache_loader_new(FileData *fd, CacheDataType load_mask,
-                             CacheLoaderDoneFunc done_func, gpointer done_data)
+                             CacheLoader::DoneFunc done_func, gpointer done_data)
 {
        CacheLoader *cl;
        gchar *found;
 
-       if (!fd || !isfile(fd->path)) return NULL;
+       if (!fd || !isfile(fd->path)) return nullptr;
 
        cl = g_new0(CacheLoader, 1);
        cl->fd = file_data_ref(fd);
@@ -242,7 +244,7 @@ CacheLoader *cache_loader_new(FileData *fd, CacheDataType load_mask,
        cl->todo_mask = load_mask;
        cl->done_mask = CACHE_LOADER_NONE;
 
-       cl->il = NULL;
+       cl->il = nullptr;
        cl->idle_id = g_idle_add(cache_loader_phase1_idle_cb, cl);
 
        cl->error = FALSE;