static void bar_pane_gps_close_cancel_cb(GenericDialog *UNUSED(gd), gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
g_list_free(pgd->geocode_list);
}
static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
FileData *fd;
GList *work;
count = 0;
geocoded_count = 0;
- pgd->geocode_list = NULL;
+ pgd->geocode_list = nullptr;
list = uri_filelist_from_gtk_selection_data(selection_data);
g_string_append_printf(message, _("\n\nPosition: %s \n"), location);
gd = generic_dialog_new(_("Geocode images"),
- "geocode_images", NULL, TRUE,
+ "geocode_images", nullptr, TRUE,
bar_pane_gps_close_cancel_cb, pgd);
generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
_("Write lat/long to meta-data?"),
message->str, TRUE);
- generic_dialog_add_button(gd, GTK_STOCK_SAVE, NULL,
+ generic_dialog_add_button(gd, GTK_STOCK_SAVE, nullptr,
bar_pane_gps_close_save_cb, TRUE);
gtk_widget_show(gd->dialog);
if (info == TARGET_TEXT_PLAIN)
{
- location = decode_geo_parameters((gchar *)gtk_selection_data_get_data(selection_data));
+ location = decode_geo_parameters(reinterpret_cast<const gchar *>(gtk_selection_data_get_data(selection_data)));
if (!(g_strstr_len(location,-1,"Error")))
{
latlong = g_strsplit(location, " ", 2);
champlain_view_center_on(CHAMPLAIN_VIEW(pgd->gps_view),
- g_ascii_strtod(latlong[0],NULL),
- g_ascii_strtod(latlong[1],NULL));
+ g_ascii_strtod(latlong[0],nullptr),
+ g_ascii_strtod(latlong[1],nullptr));
g_strfreev(latlong);
}
g_free(location);
static void bar_pane_gps_dnd_init(gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
gtk_drag_dest_set(pgd->widget,
static_cast<GtkDestDefaults>(GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP),
marker = CLUTTER_ACTOR(data);
fd = static_cast<FileData *>(g_object_get_data(G_OBJECT(marker), "file_fd"));
- if (fd->thumb_pixbuf != NULL)
+ if (fd->thumb_pixbuf != nullptr)
{
actor = gtk_clutter_texture_new();
- gtk_clutter_texture_set_from_pixbuf(GTK_CLUTTER_TEXTURE(actor), fd->thumb_pixbuf, NULL);
+ gtk_clutter_texture_set_from_pixbuf(GTK_CLUTTER_TEXTURE(actor), fd->thumb_pixbuf, nullptr);
champlain_label_set_image(CHAMPLAIN_LABEL(marker), actor);
}
thumb_loader_free(tl);
GString *text;
gint height, width;
GdkPixbufRotation rotate;
- gchar *altitude = NULL;
+ gchar *altitude = nullptr;
ThumbLoader *tl;
if (bevent->button == MOUSE_BUTTON_LEFT)
/* If the marker is showing a thumbnail, delete it
*/
current_image = champlain_label_get_image(CHAMPLAIN_LABEL(label_marker));
- if (current_image != NULL)
+ if (current_image != nullptr)
{
clutter_actor_destroy(CLUTTER_ACTOR(current_image));
- champlain_label_set_image(CHAMPLAIN_LABEL(label_marker), NULL);
+ champlain_label_set_image(CHAMPLAIN_LABEL(label_marker), nullptr);
}
current_text = g_strdup(champlain_label_get_text(CHAMPLAIN_LABEL(label_marker)));
* If not, call the thumb_loader to generate a thumbnail and update the marker later in the
* thumb_loader callback
*/
- if (fd->thumb_pixbuf != NULL)
+ if (fd->thumb_pixbuf != nullptr)
{
actor = gtk_clutter_texture_new();
- gtk_clutter_texture_set_from_pixbuf(GTK_CLUTTER_TEXTURE(actor), fd->thumb_pixbuf, NULL);
+ gtk_clutter_texture_set_from_pixbuf(GTK_CLUTTER_TEXTURE(actor), fd->thumb_pixbuf, nullptr);
champlain_label_set_image(CHAMPLAIN_LABEL(label_marker), actor);
}
- else if (fd->pixbuf != NULL)
+ else if (fd->pixbuf != nullptr)
{
actor = gtk_clutter_texture_new();
width = gdk_pixbuf_get_width (fd->pixbuf);
gtk_clutter_texture_set_from_pixbuf(GTK_CLUTTER_TEXTURE(actor),
gdk_pixbuf_rotate_simple(gdk_pixbuf_scale_simple(fd->pixbuf, THUMB_SIZE, height * THUMB_SIZE / width,
- GDK_INTERP_NEAREST), rotate), NULL);
+ GDK_INTERP_NEAREST), rotate), nullptr);
champlain_label_set_image(CHAMPLAIN_LABEL(label_marker), actor);
}
else
thumb_loader_set_callbacks(tl,
bar_pane_gps_thumb_done_cb,
bar_pane_gps_thumb_error_cb,
- NULL,
+ nullptr,
label_marker);
thumb_loader_start(tl, fd);
}
g_string_append(text, text_from_time(fd->date));
g_string_append(text, "\n");
altitude = metadata_read_string(fd, "formatted.GPSAltitude", METADATA_FORMATTED);
- if (altitude != NULL)
+ if (altitude != nullptr)
{
g_string_append(text, altitude);
}
static gboolean bar_pane_gps_create_markers_cb(gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
gdouble latitude;
gdouble longitude;
gdouble compass;
ClutterContent *canvas;
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pgd->progress),
- (gdouble)(pgd->selection_count - g_list_length(pgd->not_added)) /
- (gdouble)pgd->selection_count);
+ static_cast<gdouble>(pgd->selection_count - g_list_length(pgd->not_added)) /
+ static_cast<gdouble>(pgd->selection_count));
message = g_string_new("");
g_string_printf(message, "%i/%i", (pgd->selection_count - g_list_length(pgd->not_added)),
}
}
gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(pgd->progress), 0);
- gtk_progress_bar_set_text(GTK_PROGRESS_BAR(pgd->progress), NULL);
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR(pgd->progress), nullptr);
pgd->create_markers_id = 0;
return G_SOURCE_REMOVE;
if (pgd->bbox) champlain_bounding_box_free(pgd->bbox);
list = layout_selection_list(pgd->pane.lw);
- list = file_data_process_groups_in_selection(list, FALSE, NULL);
+ list = file_data_process_groups_in_selection(list, FALSE, nullptr);
pgd->selection_list = list;
pgd->not_added = list;
map_factory = champlain_map_source_factory_dup_default();
map_source = champlain_map_source_factory_create(map_factory, map_id);
- if (map_source != NULL)
+ if (map_source != nullptr)
{
g_object_set(G_OBJECT(pgd->gps_view), "map-source", map_source, NULL);
}
void bar_pane_gps_enable_markers_checked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
if (pgd->enable_markers_checked)
{
static void bar_pane_gps_centre_map_checked_toggle_cb(GtkWidget *UNUSED(menu_widget), gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
if (pgd->centre_map_checked)
{
static void bar_pane_gps_change_map_cb(GtkWidget *widget, gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
gchar *mapsource;
if (!gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)))
gint zoom;
ChamplainMapSource *mapsource;
const gchar *map_id;
- gchar *str = NULL;
+ gchar *str = nullptr;
GString *buffer = g_string_new(str);
gdouble position;
gint int_position;
gdouble zoom,
gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
GString *message;
message = g_string_new("");
- g_string_printf(message, _("Zoom %i"), (gint)zoom);
+ g_string_printf(message, _("Zoom %i"), static_cast<gint>(zoom));
- g_object_set(G_OBJECT(CHAMPLAIN_VIEW(pgd->gps_view)), "zoom-level", (gint)zoom, NULL);
+ g_object_set(G_OBJECT(CHAMPLAIN_VIEW(pgd->gps_view)), "zoom-level", static_cast<gint>(zoom), NULL);
gtk_widget_set_tooltip_text(GTK_WIDGET(slider), message->str);
g_string_free(message, TRUE);
GParamSpec *UNUSED(gobject),
gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
ChamplainState status;
gint zoom;
GString *message;
}
gtk_widget_set_tooltip_text(GTK_WIDGET(pgd->slider), message->str);
- gtk_scale_button_set_value(GTK_SCALE_BUTTON(pgd->slider), (gdouble)zoom);
+ gtk_scale_button_set_value(GTK_SCALE_BUTTON(pgd->slider), static_cast<gdouble>(zoom));
g_string_free(message, TRUE);
}
static void bar_pane_gps_notify_cb(FileData *fd, NotifyType type, gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
if ((type & (NOTIFY_REREAD | NOTIFY_CHANGE | NOTIFY_METADATA)) &&
g_list_find(pgd->selection_list, fd))
while (map_list)
{
- map_desc = (ChamplainMapSourceDesc *)(map_list->data);
+ map_desc = static_cast<ChamplainMapSourceDesc *>(map_list->data);
menu_item_add_radio(menu,
champlain_map_source_desc_get_name(map_desc),
- (gpointer)champlain_map_source_desc_get_id(map_desc),
+ const_cast<gchar *>(champlain_map_source_desc_get_id(map_desc)),
strcmp(champlain_map_source_desc_get_id(map_desc), current) == 0,
G_CALLBACK(bar_pane_gps_change_map_cb), pgd);
}
gd = generic_dialog_new(_("Map centering"),
- "map_centering", NULL, TRUE, NULL, pgd);
+ "map_centering", nullptr, TRUE, nullptr, pgd);
generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO,
"Map Centering", message->str, TRUE);
- generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, NULL, TRUE);
+ generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, nullptr, TRUE);
gtk_widget_show(gd->dialog);
static gboolean bar_pane_gps_map_keypress_cb(GtkWidget *UNUSED(widget), GdkEventButton *bevent, gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
GtkWidget *menu;
GtkClipboard *clipboard;
gchar *geo_coords;
if (bevent->button == MOUSE_BUTTON_RIGHT)
{
menu = bar_pane_gps_menu(pgd);
- gtk_menu_popup_at_pointer(GTK_MENU(menu), NULL);
+ gtk_menu_popup_at_pointer(GTK_MENU(menu), nullptr);
return TRUE;
}
else if (bevent->button == MOUSE_BUTTON_MIDDLE)
static void bar_pane_gps_destroy(GtkWidget *UNUSED(widget), gpointer data)
{
-
PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
+
auto pgd = static_cast<PaneGPSData *>(data);
file_data_unregister_notify_func(bar_pane_gps_notify_cb, pgd);
GtkWidget *status, *state, *progress, *slider;
ChamplainMarkerLayer *layer;
ChamplainView *view;
- const gchar *slider_list[] = {"zoom-in", "zoom-out", NULL};
+ const gchar *slider_list[] = {"zoom-in", "zoom-out", nullptr};
const gchar **slider_icons = slider_list;
pgd = g_new0(PaneGPSData, 1);
pgd->pane.expanded = expanded;
pgd->height = height;
- frame = gtk_frame_new(NULL);
+ frame = gtk_frame_new(nullptr);
DEBUG_NAME(frame);
vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
status = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
slider = gtk_scale_button_new(GTK_ICON_SIZE_SMALL_TOOLBAR, 1, 17, 1, slider_icons);
gtk_widget_set_tooltip_text(slider, _("Zoom"));
- gtk_scale_button_set_value(GTK_SCALE_BUTTON(slider), (gdouble)zoom);
+ gtk_scale_button_set_value(GTK_SCALE_BUTTON(slider), static_cast<gdouble>(zoom));
progress = gtk_progress_bar_new();
gtk_progress_bar_set_text(GTK_PROGRESS_BAR(progress), "");
GtkWidget *bar_pane_gps_new_from_config(const gchar **attribute_names, const gchar **attribute_values)
{
gchar *title = g_strdup(_("GPS Map"));
- gchar *map_id = NULL;
+ gchar *map_id = nullptr;
gboolean expanded = TRUE;
gint height = 350;
gint zoom = 7;
}
bar_pane_translate_title(PANE_COMMENT, id, &title);
- latitude = (gdouble)int_latitude / 1000000;
- longitude = (gdouble)int_longitude / 1000000;
+ latitude = static_cast<gdouble>(int_latitude) / 1000000;
+ longitude = static_cast<gdouble>(int_longitude) / 1000000;
ret = bar_pane_gps_new(id, title, map_id, zoom, latitude, longitude, expanded, height);
g_free(title);
g_free(map_id);
if (!pgd)
return;
- gchar *title = NULL;
+ gchar *title = nullptr;
while (*attribute_names)
{
static gboolean image_loader_djvu_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
{
- ImageLoaderDJVU *ld = (ImageLoaderDJVU *) loader;
+ auto ld = static_cast<ImageLoaderDJVU *>(loader);
ddjvu_context_t *ctx;
ddjvu_document_t *doc;
ddjvu_page_t *page;
cairo_surface_t *surface;
guchar *pixels;
- ctx = ddjvu_context_create(NULL);
+ ctx = ddjvu_context_create(nullptr);
- doc = ddjvu_document_create(ctx, NULL, FALSE);
+ doc = ddjvu_document_create(ctx, nullptr, FALSE);
ddjvu_stream_write(doc, 0, (char *)buf, count );
while (!ddjvu_document_decoding_done(doc));
page = ddjvu_page_create_by_pageno(doc, ld->page_num);
while (!ddjvu_page_decoding_done(page));
- fmt = ddjvu_format_create(DDJVU_FORMAT_RGB24, 0, 0);
+ fmt = ddjvu_format_create(DDJVU_FORMAT_RGB24, 0, nullptr);
width = ddjvu_page_get_width(page);
height = ddjvu_page_get_height(page);
stride = width * 4;
- pixels = (guchar *)g_malloc(height * stride);
+ pixels = static_cast<guchar *>(g_malloc(height * stride));
prect.x = 0;
prect.y = 0;
surface = cairo_image_surface_create_for_data(pixels, CAIRO_FORMAT_RGB24, width, height, stride);
- ddjvu_page_render(page, DDJVU_RENDER_COLOR, &prect, &rrect, fmt, stride, (char *)pixels);
+ ddjvu_page_render(page, DDJVU_RENDER_COLOR, &prect, &rrect, fmt, stride, reinterpret_cast<char *>(pixels));
/**
* @FIXME implementation of rotation is not correct */
GdkPixbuf *tmp1;
GdkPixbuf *tmp2;
- tmp1 = gdk_pixbuf_new_from_data(pixels, GDK_COLORSPACE_RGB, alpha, 8, width, height, stride, free_buffer, NULL);
+ tmp1 = gdk_pixbuf_new_from_data(pixels, GDK_COLORSPACE_RGB, alpha, 8, width, height, stride, free_buffer, nullptr);
tmp2 = gdk_pixbuf_flip(tmp1, TRUE);
g_object_unref(tmp1);
static gpointer image_loader_djvu_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
{
- ImageLoaderDJVU *loader = g_new0(ImageLoaderDJVU, 1);
+ auto loader = g_new0(ImageLoaderDJVU, 1);
loader->area_updated_cb = area_updated_cb;
loader->size_cb = size_cb;
loader->area_prepared_cb = area_prepared_cb;
loader->data = data;
- return (gpointer) loader;
+ return loader;
}
static void image_loader_djvu_set_size(gpointer loader, int width, int height)
{
- ImageLoaderDJVU *ld = (ImageLoaderDJVU *) loader;
+ auto ld = static_cast<ImageLoaderDJVU *>(loader);
ld->requested_width = width;
ld->requested_height = height;
}
static GdkPixbuf* image_loader_djvu_get_pixbuf(gpointer loader)
{
- ImageLoaderDJVU *ld = (ImageLoaderDJVU *) loader;
+ auto ld = static_cast<ImageLoaderDJVU *>(loader);
return ld->pixbuf;
}
static gchar** image_loader_djvu_get_format_mime_types(gpointer UNUSED(loader))
{
- static const gchar *mime[] = {"image/vnd.djvu", NULL};
+ static const gchar *mime[] = {"image/vnd.djvu", nullptr};
return g_strdupv(const_cast<gchar **>(mime));
}
static void image_loader_djvu_set_page_num(gpointer loader, gint page_num)
{
- ImageLoaderDJVU *ld = (ImageLoaderDJVU *) loader;
+ auto ld = static_cast<ImageLoaderDJVU *>(loader);
ld->page_num = page_num;
}
static gint image_loader_djvu_get_page_total(gpointer loader)
{
- ImageLoaderDJVU *ld = (ImageLoaderDJVU *) loader;
+ auto ld = static_cast<ImageLoaderDJVU *>(loader);
return ld->page_total;
}
static void image_loader_djvu_abort(gpointer loader)
{
- ImageLoaderDJVU *ld = (ImageLoaderDJVU *) loader;
+ auto ld = static_cast<ImageLoaderDJVU *>(loader);
ld->abort = TRUE;
}
static void image_loader_djvu_free(gpointer loader)
{
- ImageLoaderDJVU *ld = (ImageLoaderDJVU *) loader;
+ auto ld = static_cast<ImageLoaderDJVU *>(loader);
if (ld->pixbuf) g_object_unref(ld->pixbuf);
g_free(ld);
}
funcs->loader_new = image_loader_djvu_new;
funcs->set_size = image_loader_djvu_set_size;
funcs->load = image_loader_djvu_load;
- funcs->write = NULL;
+ funcs->write = nullptr;
funcs->get_pixbuf = image_loader_djvu_get_pixbuf;
funcs->close = image_loader_djvu_close;
funcs->abort = image_loader_djvu_abort;
psrc->cur += n;
}
else
- n = (OPJ_SIZE_T)-1;
+ n = static_cast<OPJ_SIZE_T>(-1);
return n;
}
if (0 == len)
len = 1;
- OPJ_SIZE_T dist = (guchar *)pcur - (guchar *)pbuf, n = len - dist;
+ OPJ_SIZE_T dist = static_cast<guchar *>(pcur) - static_cast<guchar *>(pbuf), n = len - dist;
g_assert (dist <= len);
while (n < p_nb_bytes) {
if (len != p_source_buffer->len) {
pbuf = malloc (len);
- if (0 == pbuf)
- return (OPJ_SIZE_T)-1;
+ if (nullptr == pbuf)
+ return static_cast<OPJ_SIZE_T>(-1);
if (p_source_buffer->buf) {
memcpy (pbuf, p_source_buffer->buf, dist);
}
p_source_buffer->buf = static_cast<OPJ_BYTE *>(pbuf);
- p_source_buffer->cur = (guchar *)pbuf + dist;
+ p_source_buffer->cur = static_cast<guchar *>(pbuf) + dist;
p_source_buffer->len = len;
}
psrc->cur += len;
}
else
- n = (OPJ_SIZE_T)-1;
+ n = static_cast<OPJ_SIZE_T>(-1);
return n;
}
{
OPJ_SIZE_T n = psrc->len;
- if (n > (gulong)len)
+ if (n > static_cast<gulong>(len))
n = len;
psrc->cur = psrc->buf + n;
opj_stream_t* OPJ_CALLCONV opj_stream_create_buffer_stream (opj_buffer_info_t* psrc, OPJ_BOOL input)
{
if (!psrc)
- return 0;
+ return nullptr;
opj_stream_t* ps = opj_stream_default_create (input);
- if (0 == ps)
- return 0;
+ if (nullptr == ps)
+ return nullptr;
- opj_stream_set_user_data (ps, psrc, 0);
+ opj_stream_set_user_data (ps, psrc, nullptr);
opj_stream_set_user_data_length (ps, psrc->len);
if (input)
opj_stream_set_read_function (
- ps, (opj_stream_read_fn)opj_read_from_buffer);
+ ps, reinterpret_cast<opj_stream_read_fn>(opj_read_from_buffer));
else
opj_stream_set_write_function(
- ps,(opj_stream_write_fn) opj_write_to_buffer);
+ ps,reinterpret_cast<opj_stream_write_fn>(opj_write_to_buffer));
opj_stream_set_skip_function (
- ps, (opj_stream_skip_fn)opj_skip_from_buffer);
+ ps, reinterpret_cast<opj_stream_skip_fn>(opj_skip_from_buffer));
opj_stream_set_seek_function (
- ps, (opj_stream_seek_fn)opj_seek_from_buffer);
+ ps, reinterpret_cast<opj_stream_seek_fn>(opj_seek_from_buffer));
return ps;
}
static gboolean image_loader_j2k_load(gpointer loader, const guchar *buf, gsize count, GError **UNUSED(error))
{
- ImageLoaderJ2K *ld = (ImageLoaderJ2K *) loader;
+ auto ld = static_cast<ImageLoaderJ2K *>(loader);
opj_stream_t *stream;
opj_codec_t *codec;
opj_dparameters_t parameters;
opj_buffer_info_t *decode_buffer;
guchar *buf_copy;
- stream = NULL;
- codec = NULL;
- image = NULL;
+ stream = nullptr;
+ codec = nullptr;
+ image = nullptr;
- buf_copy = (guchar *) g_malloc(count);
+ buf_copy = static_cast<guchar *>(g_malloc(count));
memcpy(buf_copy, buf, count);
decode_buffer = g_new0(opj_buffer_info_t, 1);
}
}
- ld->pixbuf = gdk_pixbuf_new_from_data(pixels, GDK_COLORSPACE_RGB, FALSE , 8, width, height, width * bytes_per_pixel, free_buffer, NULL);
+ ld->pixbuf = gdk_pixbuf_new_from_data(pixels, GDK_COLORSPACE_RGB, FALSE , 8, width, height, width * bytes_per_pixel, free_buffer, nullptr);
ld->area_updated_cb(loader, 0, 0, width, height, ld->data);
static gpointer image_loader_j2k_new(ImageLoaderBackendCbAreaUpdated area_updated_cb, ImageLoaderBackendCbSize size_cb, ImageLoaderBackendCbAreaPrepared area_prepared_cb, gpointer data)
{
- ImageLoaderJ2K *loader = g_new0(ImageLoaderJ2K, 1);
+ auto loader = g_new0(ImageLoaderJ2K, 1);
loader->area_updated_cb = area_updated_cb;
loader->size_cb = size_cb;
loader->area_prepared_cb = area_prepared_cb;
loader->data = data;
- return (gpointer) loader;
+ return loader;
}
static void image_loader_j2k_set_size(gpointer loader, int width, int height)
{
- ImageLoaderJ2K *ld = (ImageLoaderJ2K *) loader;
+ auto ld = static_cast<ImageLoaderJ2K *>(loader);
ld->requested_width = width;
ld->requested_height = height;
}
static GdkPixbuf* image_loader_j2k_get_pixbuf(gpointer loader)
{
- ImageLoaderJ2K *ld = (ImageLoaderJ2K *) loader;
+ auto ld = static_cast<ImageLoaderJ2K *>(loader);
return ld->pixbuf;
}
static gchar** image_loader_j2k_get_format_mime_types(gpointer UNUSED(loader))
{
- static const gchar *mime[] = {"image/jp2", NULL};
+ static const gchar *mime[] = {"image/jp2", nullptr};
return g_strdupv(const_cast<gchar **>(mime));
}
static void image_loader_j2k_abort(gpointer loader)
{
- ImageLoaderJ2K *ld = (ImageLoaderJ2K *) loader;
+ auto ld = static_cast<ImageLoaderJ2K *>(loader);
ld->abort = TRUE;
}
static void image_loader_j2k_free(gpointer loader)
{
- ImageLoaderJ2K *ld = (ImageLoaderJ2K *) loader;
+ auto ld = static_cast<ImageLoaderJ2K *>(loader);
if (ld->pixbuf) g_object_unref(ld->pixbuf);
g_free(ld);
}
funcs->loader_new = image_loader_j2k_new;
funcs->set_size = image_loader_j2k_set_size;
funcs->load = image_loader_j2k_load;
- funcs->write = NULL;
+ funcs->write = nullptr;
funcs->get_pixbuf = image_loader_j2k_get_pixbuf;
funcs->close = image_loader_j2k_close;
funcs->abort = image_loader_j2k_abort;
projects / geeqie.git / commitdiff