clang-tidy: more C cast removals

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/src/color-man.cc b/src/color-man.cc
index c1b9443..c6e6b17 100644 (file)
--- a/src/color-man.cc
+++ b/src/color-man.cc
@@ -500,9 +500,9 @@ static cmsToneCurve* colorspaces_create_transfer(int32_t size, double (*fct)(dou
 
        for(int32_t i = 0; i < size; ++i)
                {
-               const double x = (float)i / (size - 1);
+               const double x = static_cast<float>(i) / (size - 1);
                const double y = MIN(fct(x), 1.0f);
-               values[i] = (float)y;
+               values[i] = static_cast<float>(y);
                }
 
        cmsToneCurve* result = cmsBuildTabulatedToneCurveFloat(NULL, size, values);
@@ -714,7 +714,7 @@ static guchar *nclx_to_lcms_profile(const struct heif_color_profile_nclx *nclx,
                                *profile_len = size;
                                }
                        cmsCloseProfile(profile);
-                       return (guchar *)data;
+                       return static_cast<guchar *>(data);
                        }
                else
                        {
@@ -778,7 +778,7 @@ guchar *heif_color_profile(FileData *fd, guint *profile_len)
                heif_context_free(ctx);
                heif_nclx_color_profile_free(nclxcp);
 
-               return (guchar *)data;
+               return static_cast<guchar *>(data);
                }
        else
                {
@@ -797,7 +797,7 @@ guchar *heif_color_profile(FileData *fd, guint *profile_len)
        heif_context_free(ctx);
        heif_nclx_color_profile_free(nclxcp);
 
-       return (guchar *)profile;
+       return profile;
 }
 #else
 guchar *heif_color_profile(FileData *UNUSED(fd), guint *UNUSED(profile_len))

diff --git a/src/exif-common.cc b/src/exif-common.cc
index 6d04644..fcf5d1b 100644 (file)
--- a/src/exif-common.cc
+++ b/src/exif-common.cc
@@ -511,7 +511,7 @@ static gchar *exif_build_formatted_ColorProfile(ExifData *exif)
 #ifdef HAVE_LCMS2
                                profileID[16] = '\0';
                                cmsGetHeaderProfileID(profile, profileID);
-                               name = (gchar *) profileID;
+                               name = reinterpret_cast<gchar *>(profileID);
 #else
                                name = (gchar *) cmsTakeProductName(profile);
 #endif

diff --git a/src/image-load-heif.cc b/src/image-load-heif.cc
index 68de7f7..a8d16da 100644 (file)
--- a/src/image-load-heif.cc
+++ b/src/image-load-heif.cc
@@ -42,12 +42,12 @@ struct _ImageLoaderHEIF {
 
 static void free_buffer(guchar *UNUSED(pixels), gpointer data)
 {
-       heif_image_release((const struct heif_image*)data);
+       heif_image_release(static_cast<const struct heif_image*>(data));
 }
 
 static gboolean image_loader_heif_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       ImageLoaderHEIF *ld = static_cast<ImageLoaderHEIF *>(loader);
        struct heif_context* ctx;
        struct heif_image* img;
        struct heif_error error_code;
@@ -119,19 +119,19 @@ static gpointer image_loader_heif_new(ImageLoaderBackendCbAreaUpdated area_updat
        loader->area_prepared_cb = area_prepared_cb;
        loader->data = data;
        loader->page_num = 0;
-       return (gpointer) loader;
+       return loader;
 }
 
 static void image_loader_heif_set_size(gpointer loader, int width, int height)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       ImageLoaderHEIF *ld = static_cast<ImageLoaderHEIF *>(loader);
        ld->requested_width = width;
        ld->requested_height = height;
 }
 
 static GdkPixbuf* image_loader_heif_get_pixbuf(gpointer loader)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       ImageLoaderHEIF *ld = static_cast<ImageLoaderHEIF *>(loader);
        return ld->pixbuf;
 }
 
@@ -148,14 +148,14 @@ static gchar** image_loader_heif_get_format_mime_types(gpointer UNUSED(loader))
 
 static void image_loader_heif_set_page_num(gpointer loader, gint page_num)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       ImageLoaderHEIF *ld = static_cast<ImageLoaderHEIF *>(loader);
 
        ld->page_num = page_num;
 }
 
 static gint image_loader_heif_get_page_total(gpointer loader)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       ImageLoaderHEIF *ld = static_cast<ImageLoaderHEIF *>(loader);
 
        return ld->page_total;
 }
@@ -167,13 +167,13 @@ static gboolean image_loader_heif_close(gpointer UNUSED(loader), GError **UNUSED
 
 static void image_loader_heif_abort(gpointer loader)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       ImageLoaderHEIF *ld = static_cast<ImageLoaderHEIF *>(loader);
        ld->abort = TRUE;
 }
 
 static void image_loader_heif_free(gpointer loader)
 {
-       ImageLoaderHEIF *ld = (ImageLoaderHEIF *) loader;
+       ImageLoaderHEIF *ld = static_cast<ImageLoaderHEIF *>(loader);
        if (ld->pixbuf) g_object_unref(ld->pixbuf);
        g_free(ld);
 }

diff --git a/src/image-load-libraw.cc b/src/image-load-libraw.cc
index 01a98f1..03ed3a5 100644 (file)
--- a/src/image-load-libraw.cc
+++ b/src/image-load-libraw.cc
@@ -53,7 +53,7 @@ void libraw_free_preview(guchar *buf)
 
        while (work)
                {
-               UnmapData *ud = (UnmapData *)work->data;
+               UnmapData *ud = static_cast<UnmapData *>(work->data);
                if (ud->ptr == buf)
                        {
                        munmap(ud->map_data, ud->map_len);
@@ -92,7 +92,7 @@ guchar *libraw_get_preview(ImageLoader *il, guint *data_len)
                }
 
        map_len = st.st_size;
-       map_data = (guchar *) mmap(0, map_len, PROT_READ, MAP_PRIVATE, fd, 0);
+       map_data = static_cast<guchar *>(mmap(0, map_len, PROT_READ, MAP_PRIVATE, fd, 0));
        close(fd);
 
        if (map_data == MAP_FAILED)
@@ -107,24 +107,24 @@ guchar *libraw_get_preview(ImageLoader *il, guint *data_len)
                return NULL;
                }
 
-       ret = libraw_open_buffer(lrdt, (void *)map_data, map_len);
+       ret = libraw_open_buffer(lrdt, map_data, map_len);
        if (ret == LIBRAW_SUCCESS)
                {
                ret = libraw_unpack_thumb(lrdt);
                if (ret == LIBRAW_SUCCESS)
                        {
-                       il->mapped_file = (guchar *)lrdt->thumbnail.thumb;
+                       il->mapped_file = reinterpret_cast<guchar *>(lrdt->thumbnail.thumb);
                        *data_len = lrdt->thumbnail.tlength;
 
                        ud = g_new(UnmapData, 1);
-                       ud->ptr =(guchar *)lrdt->thumbnail.thumb;
+                       ud->ptr =reinterpret_cast<guchar *>(lrdt->thumbnail.thumb);
                        ud->map_data = map_data;
                        ud->map_len = lrdt->thumbnail.tlength;
                        ud->lrdt = lrdt;
 
                        libraw_unmap_list = g_list_prepend(libraw_unmap_list, ud);
 
-                       return (guchar *)lrdt->thumbnail.thumb;
+                       return reinterpret_cast<guchar *>(lrdt->thumbnail.thumb);
                        }
                }
 

diff --git a/src/image-load-pdf.cc b/src/image-load-pdf.cc
index 3891ebc..63c28b0 100644 (file)
--- a/src/image-load-pdf.cc
+++ b/src/image-load-pdf.cc
@@ -42,7 +42,7 @@ struct _ImageLoaderPDF {
 
 static gboolean image_loader_pdf_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
 {
-       ImageLoaderPDF *ld = (ImageLoaderPDF *) loader;
+       ImageLoaderPDF *ld = static_cast<ImageLoaderPDF *>(loader);
        GError *poppler_error = NULL;
        PopplerPage *page;
        PopplerDocument *document;
@@ -52,7 +52,7 @@ static gboolean image_loader_pdf_load(gpointer loader, const guchar *buf, gsize
        gboolean ret = FALSE;
        gint page_total;
 
-       document = poppler_document_new_from_data((gchar *)buf, count, NULL, &poppler_error);
+       document = poppler_document_new_from_data((gchar *)(buf), count, NULL, &poppler_error);
 
        if (poppler_error)
                {
@@ -100,19 +100,19 @@ static gpointer image_loader_pdf_new(ImageLoaderBackendCbAreaUpdated area_update
        loader->area_prepared_cb = area_prepared_cb;
        loader->data = data;
        loader->page_num = 0;
-       return (gpointer) loader;
+       return loader;
 }
 
 static void image_loader_pdf_set_size(gpointer loader, int width, int height)
 {
-       ImageLoaderPDF *ld = (ImageLoaderPDF *) loader;
+       ImageLoaderPDF *ld = static_cast<ImageLoaderPDF *>(loader);
        ld->requested_width = width;
        ld->requested_height = height;
 }
 
 static GdkPixbuf* image_loader_pdf_get_pixbuf(gpointer loader)
 {
-       ImageLoaderPDF *ld = (ImageLoaderPDF *) loader;
+       ImageLoaderPDF *ld = static_cast<ImageLoaderPDF *>(loader);
        return ld->pixbuf;
 }
 
@@ -129,14 +129,14 @@ static gchar** image_loader_pdf_get_format_mime_types(gpointer UNUSED(loader))
 
 static void image_loader_pdf_set_page_num(gpointer loader, gint page_num)
 {
-       ImageLoaderPDF *ld = (ImageLoaderPDF *) loader;
+       ImageLoaderPDF *ld = static_cast<ImageLoaderPDF *>(loader);
 
        ld->page_num = page_num;
 }
 
 static gint image_loader_pdf_get_page_total(gpointer loader)
 {
-       ImageLoaderPDF *ld = (ImageLoaderPDF *) loader;
+       ImageLoaderPDF *ld = static_cast<ImageLoaderPDF *>(loader);
 
        return ld->page_total;
 }
@@ -148,13 +148,13 @@ static gboolean image_loader_pdf_close(gpointer UNUSED(loader), GError **UNUSED(
 
 static void image_loader_pdf_abort(gpointer loader)
 {
-       ImageLoaderPDF *ld = (ImageLoaderPDF *) loader;
+       ImageLoaderPDF *ld = static_cast<ImageLoaderPDF *>(loader);
        ld->abort = TRUE;
 }
 
 static void image_loader_pdf_free(gpointer loader)
 {
-       ImageLoaderPDF *ld = (ImageLoaderPDF *) loader;
+       ImageLoaderPDF *ld = static_cast<ImageLoaderPDF *>(loader);
        if (ld->pixbuf) g_object_unref(ld->pixbuf);
        g_free(ld);
 }

diff --git a/src/image-load-tiff.cc b/src/image-load-tiff.cc
index 2d656e4..af16e6b 100644 (file)
--- a/src/image-load-tiff.cc
+++ b/src/image-load-tiff.cc
@@ -63,7 +63,7 @@ static void free_buffer (guchar *pixels, gpointer UNUSED(data))
 static tsize_t
 tiff_load_read (thandle_t handle, tdata_t buf, tsize_t size)
 {
-       ImageLoaderTiff *context = (ImageLoaderTiff *)handle;
+       ImageLoaderTiff *context = static_cast<ImageLoaderTiff *>(handle);
 
        if (context->pos + size > context->used)
                return 0;
@@ -82,7 +82,7 @@ tiff_load_write (thandle_t UNUSED(handle), tdata_t UNUSED(buf), tsize_t UNUSED(s
 static toff_t
 tiff_load_seek (thandle_t handle, toff_t offset, int whence)
 {
-       ImageLoaderTiff *context = (ImageLoaderTiff *)handle;
+       ImageLoaderTiff *context = static_cast<ImageLoaderTiff *>(handle);
 
        switch (whence)
                {
@@ -117,16 +117,16 @@ tiff_load_close (thandle_t UNUSED(context))
 static toff_t
 tiff_load_size (thandle_t handle)
 {
-       ImageLoaderTiff *context = (ImageLoaderTiff *)handle;
+       ImageLoaderTiff *context = static_cast<ImageLoaderTiff *>(handle);
        return context->used;
 }
 
 static int
 tiff_load_map_file (thandle_t handle, tdata_t *buf, toff_t *size)
 {
-       ImageLoaderTiff *context = (ImageLoaderTiff *)handle;
+       ImageLoaderTiff *context = static_cast<ImageLoaderTiff *>(handle);
 
-       *buf = (tdata_t *) context->buffer;
+       *buf = const_cast<guchar *>(context->buffer);
        *size = context->used;
 
        return 0;
@@ -139,7 +139,7 @@ tiff_load_unmap_file (thandle_t UNUSED(handle), tdata_t UNUSED(data), toff_t UNU
 
 static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
 {
-       ImageLoaderTiff *lt = (ImageLoaderTiff *) loader;
+       ImageLoaderTiff *lt = static_cast<ImageLoaderTiff *>(loader);
 
        TIFF *tiff;
        guchar *pixels = NULL;
@@ -209,8 +209,8 @@ static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsiz
                return FALSE;
                }
 
-       bytes = (size_t) height * rowstride;
-       if (bytes / rowstride != (size_t) height)
+       bytes = static_cast<size_t>(height) * rowstride;
+       if (bytes / rowstride != static_cast<size_t>(height))
                { /* overflow */
                DEBUG_1("Dimensions of TIFF image too large: height %d", height);
                TIFFClose(tiff);
@@ -248,7 +248,7 @@ static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsiz
                /* read by strip */
                ptrdiff_t row;
                const size_t line_bytes = width * sizeof(guint32);
-               guchar *wrk_line = (guchar *)g_malloc(line_bytes);
+               guchar *wrk_line = static_cast<guchar *>(g_malloc(line_bytes));
 
                for (row = 0; row < height; row += rowsperstrip)
                        {
@@ -259,14 +259,14 @@ static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsiz
                        }
 
                        /* Read the strip into an RGBA array */
-                       if (!TIFFReadRGBAStrip(tiff, row, (guint32 *)(pixels + row * rowstride))) {
+                       if (!TIFFReadRGBAStrip(tiff, row, reinterpret_cast<guint32 *>(pixels + row * rowstride))) {
                                break;
                        }
 
                        /*
                         * Figure out the number of scanlines actually in this strip.
                        */
-                       if (row + (int)rowsperstrip > height)
+                       if (row + static_cast<int>(rowsperstrip) > height)
                                rows_to_write = height - row;
                        else
                                rows_to_write = rowsperstrip;
@@ -293,7 +293,7 @@ static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsiz
        else
                {
                /* fallback, tiled tiff */
-               if (!TIFFReadRGBAImageOriented (tiff, width, height, (guint32 *)pixels, ORIENTATION_TOPLEFT, 1))
+               if (!TIFFReadRGBAImageOriented (tiff, width, height, reinterpret_cast<guint32 *>(pixels), ORIENTATION_TOPLEFT, 1))
                        {
                        TIFFClose(tiff);
                        return FALSE;
@@ -336,20 +336,20 @@ static gpointer image_loader_tiff_new(ImageLoaderBackendCbAreaUpdated area_updat
        loader->size_cb = size_cb;
        loader->area_prepared_cb = area_prepared_cb;
        loader->data = data;
-       return (gpointer) loader;
+       return loader;
 }
 
 
 static void image_loader_tiff_set_size(gpointer loader, int width, int height)
 {
-       ImageLoaderTiff *lt = (ImageLoaderTiff *) loader;
+       ImageLoaderTiff *lt = static_cast<ImageLoaderTiff *>(loader);
        lt->requested_width = width;
        lt->requested_height = height;
 }
 
 static GdkPixbuf* image_loader_tiff_get_pixbuf(gpointer loader)
 {
-       ImageLoaderTiff *lt = (ImageLoaderTiff *) loader;
+       ImageLoaderTiff *lt = static_cast<ImageLoaderTiff *>(loader);
        return lt->pixbuf;
 }
 
@@ -370,27 +370,27 @@ static gboolean image_loader_tiff_close(gpointer UNUSED(loader), GError **UNUSED
 
 static void image_loader_tiff_abort(gpointer loader)
 {
-       ImageLoaderTiff *lt = (ImageLoaderTiff *) loader;
+       ImageLoaderTiff *lt = static_cast<ImageLoaderTiff *>(loader);
        lt->abort = TRUE;
 }
 
 static void image_loader_tiff_free(gpointer loader)
 {
-       ImageLoaderTiff *lt = (ImageLoaderTiff *) loader;
+       ImageLoaderTiff *lt = static_cast<ImageLoaderTiff *>(loader);
        if (lt->pixbuf) g_object_unref(lt->pixbuf);
        g_free(lt);
 }
 
 static void image_loader_tiff_set_page_num(gpointer loader, gint page_num)
 {
-       ImageLoaderTiff *lt = (ImageLoaderTiff *) loader;
+       ImageLoaderTiff *lt = static_cast<ImageLoaderTiff *>(loader);
 
        lt->page_num = page_num;
 }
 
 static gint image_loader_tiff_get_page_total(gpointer loader)
 {
-       ImageLoaderTiff *lt = (ImageLoaderTiff *) loader;
+       ImageLoaderTiff *lt = static_cast<ImageLoaderTiff *>(loader);
 
        return lt->page_total;
 }

diff --git a/src/lua.cc b/src/lua.cc
index c3abcd9..ffff595 100644 (file)
--- a/src/lua.cc
+++ b/src/lua.cc
@@ -41,11 +41,11 @@
 /**
  * @file
  * User API consists of the following namespaces:
- * 
+ *
  * @link image_methods Image:@endlink basic image information
  *
  * <b>Collection</b>: not implemented
- * 
+ *
  * @link exif_methods <exif-structure>:get_datum() @endlink get single exif parameter
  *
  */
@@ -76,16 +76,16 @@ static FileData *lua_check_image(lua_State *L, int index)
 {
        FileData **fd;
        luaL_checktype(L, index, LUA_TUSERDATA);
-       fd = (FileData **)luaL_checkudata(L, index, "Image");
+       fd = static_cast<FileData **>(luaL_checkudata(L, index, "Image"));
        if (fd == NULL) luaL_typerror(L, index, "Image");
        return *fd;
 }
 
 /**
  * @brief Get exif structure of selected image
- * @param L 
+ * @param L
  * @returns An #ExifData data structure containing the entire exif data
- * 
+ *
  * To be used in conjunction with @link lua_exif_get_datum <exif-structure>:get_datum() @endlink
  */
 static int lua_image_get_exif(lua_State *L)
@@ -97,7 +97,7 @@ static int lua_image_get_exif(lua_State *L)
        fd = lua_check_image(L, 1);
        exif = exif_read_fd(fd);
 
-       exif_data = (ExifData **)lua_newuserdata(L, sizeof(ExifData *));
+       exif_data = static_cast<ExifData **>(lua_newuserdata(L, sizeof(ExifData *)));
        luaL_getmetatable(L, "Exif");
        lua_setmetatable(L, -2);
 
@@ -108,10 +108,10 @@ static int lua_image_get_exif(lua_State *L)
 
 /**
  * @brief Get full path of selected image
- * @param L 
+ * @param L
  * @returns char The full path of the file, including filename and extension
- * 
- * 
+ *
+ *
  */
 static int lua_image_get_path(lua_State *L)
 {
@@ -124,10 +124,10 @@ static int lua_image_get_path(lua_State *L)
 
 /**
  * @brief Get full filename of selected image
- * @param L 
+ * @param L
  * @returns char The full filename including extension
- * 
- * 
+ *
+ *
  */
 static int lua_image_get_name(lua_State *L)
 {
@@ -140,10 +140,10 @@ static int lua_image_get_name(lua_State *L)
 
 /**
  * @brief Get file extension of selected image
- * @param L 
+ * @param L
  * @returns char The file extension including preceding dot
- * 
- * 
+ *
+ *
  */
 static int lua_image_get_extension(lua_State *L)
 {
@@ -156,9 +156,9 @@ static int lua_image_get_extension(lua_State *L)
 
 /**
  * @brief Get file date of selected image
- * @param L 
+ * @param L
  * @returns time_t The file date in Unix timestamp format.
- * 
+ *
  * time_t - signed integer which represents the number of seconds since
  * the start of the Unix epoch: midnight UTC of January 1, 1970
  */
@@ -173,10 +173,10 @@ static int lua_image_get_date(lua_State *L)
 
 /**
  * @brief Get file size of selected image
- * @param L 
+ * @param L
  * @returns integer The file size in bytes
- * 
- * 
+ *
+ *
  */
 static int lua_image_get_size(lua_State *L)
 {
@@ -189,12 +189,12 @@ static int lua_image_get_size(lua_State *L)
 
 /**
  * @brief Get marks of selected image
- * @param L 
+ * @param L
  * @returns unsigned integer Bit map of marks set
- * 
+ *
  * Bit 0 == Mark 1 etc.
- * 
- * 
+ *
+ *
  */
 static int lua_image_get_marks(lua_State *L)
 {
@@ -209,16 +209,16 @@ static ExifData *lua_check_exif(lua_State *L, int index)
 {
        ExifData **exif;
        luaL_checktype(L, index, LUA_TUSERDATA);
-       exif = (ExifData **)luaL_checkudata(L, index, "Exif");
+       exif = static_cast<ExifData **>(luaL_checkudata(L, index, "Exif"));
        if (exif == NULL) luaL_typerror(L, index, "Exif");
        return *exif;
 }
 
 /**
  * @brief Interface for EXIF data
- * @param L 
+ * @param L
  * @returns <i>return</i> A single exif tag extracted from a structure output by the @link lua_image_get_exif Image:get_exif() @endlink command
- * 
+ *
  * e.g. \n
  * exif_structure = Image:get_exif(); \n
  * DateTimeDigitized = exif_structure:get_datum("Exif.Photo.DateTimeDigitized");
@@ -227,7 +227,7 @@ static ExifData *lua_check_exif(lua_State *L, int index)
  * Exif.Photo.DateTimeOriginal = signed integer time_t \n
  * Exif.Photo.DateTimeDigitized = signed integer time_t \n
  * otherwise char
- * 
+ *
  */
 static int lua_exif_get_datum(lua_State *L)
 {
@@ -239,7 +239,7 @@ static int lua_exif_get_datum(lua_State *L)
 
        exif = lua_check_exif(L, 1);
        key = luaL_checkstring(L, 2);
-       if (key == (gchar*)NULL || key[0] == '\0')
+       if (key == nullptr || key[0] == '\0')
                {
                lua_pushnil(L);
                return 1;
@@ -306,7 +306,7 @@ static const luaL_Reg image_methods[] = {
  * Call by e.g. \n
  * @link lua_exif_get_datum <exif-structure>:get_datum() @endlink \n
  * where <exif-structure> is the output of @link lua_image_get_exif Image:get_exif() @endlink
- * 
+ *
  * exif_structure = Image:get_exif(); \n
  * DateTimeDigitized = exif_structure:get_datum("Exif.Photo.DateTimeDigitized");
  */
@@ -390,7 +390,7 @@ gchar *lua_callvalue(FileData *fd, const gchar *file, const gchar *function)
        lua_setglobal(L, "Collection");
 
        /* Current Image */
-       image_data = (FileData **)lua_newuserdata(L, sizeof(FileData *));
+       image_data = static_cast<FileData **>(lua_newuserdata(L, sizeof(FileData *)));
        luaL_getmetatable(L, "Image");
        lua_setmetatable(L, -2);
        lua_setglobal(L, "Image");