Sort headers using clang-tidy

[geeqie.git] / src / image-load-djvu.cc

diff --git a/src/image-load-djvu.cc b/src/image-load-djvu.cc
index 1067d41..5f67826 100644 (file)
--- a/src/image-load-djvu.cc
+++ b/src/image-load-djvu.cc
@@ -18,16 +18,18 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "main.h"
-
-#include "image-load.h"
 #include "image-load-djvu.h"
 
+#include <config.h>
+
 #ifdef HAVE_DJVU
 
+#include <cairo.h>
 #include <libdjvu/ddjvuapi.h>
 #include <libdjvu/miniexp.h>
 
+#include "image-load.h"
+
 struct ImageLoaderDJVU {
        ImageLoaderBackendCbAreaUpdated area_updated_cb;
        ImageLoaderBackendCbSize size_cb;
@@ -41,12 +43,12 @@ struct ImageLoaderDJVU {
        gint page_total;
 };
 
-static void free_buffer(guchar *pixels, gpointer UNUSED(data))
+static void free_buffer(guchar *pixels, gpointer)
 {
        g_free (pixels);;
 }
 
-static gboolean image_loader_djvu_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
+static gboolean image_loader_djvu_load(gpointer loader, const guchar *buf, gsize count, GError **)
 {
        auto ld = static_cast<ImageLoaderDJVU *>(loader);
        ddjvu_context_t *ctx;
@@ -55,7 +57,8 @@ static gboolean image_loader_djvu_load(gpointer loader, const guchar *buf, gsize
        ddjvu_rect_t rrect;
        ddjvu_rect_t prect;
        ddjvu_format_t *fmt;
-       gint width, height;
+       gint width;
+       gint height;
        gint stride;
        gboolean alpha = FALSE;
        cairo_surface_t *surface;
@@ -65,7 +68,7 @@ static gboolean image_loader_djvu_load(gpointer loader, const guchar *buf, gsize
 
        doc = ddjvu_document_create(ctx, nullptr, FALSE);
 
-       ddjvu_stream_write(doc, 0, (char *)buf, count );
+       ddjvu_stream_write(doc, 0, reinterpret_cast<const char *>(buf), count );
        while (!ddjvu_document_decoding_done(doc));
 
        ld->page_total = ddjvu_document_get_pagenum(doc);
@@ -135,12 +138,12 @@ static GdkPixbuf* image_loader_djvu_get_pixbuf(gpointer loader)
        return ld->pixbuf;
 }
 
-static gchar* image_loader_djvu_get_format_name(gpointer UNUSED(loader))
+static gchar* image_loader_djvu_get_format_name(gpointer)
 {
        return g_strdup("djvu");
 }
 
-static gchar** image_loader_djvu_get_format_mime_types(gpointer UNUSED(loader))
+static gchar** image_loader_djvu_get_format_mime_types(gpointer)
 {
        static const gchar *mime[] = {"image/vnd.djvu", nullptr};
        return g_strdupv(const_cast<gchar **>(mime));
@@ -160,7 +163,7 @@ static gint image_loader_djvu_get_page_total(gpointer loader)
        return ld->page_total;
 }
 
-static gboolean image_loader_djvu_close(gpointer UNUSED(loader), GError **UNUSED(error))
+static gboolean image_loader_djvu_close(gpointer, GError **)
 {
        return TRUE;
 }