const gchar *name;
gchar *text;
gboolean with_hist;
- const HistMap *histmap;
+ const HistMap *histmap = NULL;
ImageWindow *imd = osd->imd;
FileData *fd = image_get_fd(imd);
if (with_hist)
{
histmap = histmap_get(imd->image_fd);
- if (!histmap)
+ if (!histmap)
{
histmap_start_idle(imd->image_fd);
with_hist = FALSE;
pixbuf_renderer_overlay_set((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
}
-#if 0 /* unused for now */
-static gint image_overlay_get(ImageWindow *imd, gint id, GdkPixbuf **pixbuf, gint *x, gint *y)
-{
- return pixbuf_renderer_overlay_get((PixbufRenderer *)imd->pr, id, pixbuf, x, y);
-}
-#endif
-
static void image_overlay_remove(ImageWindow *imd, gint id)
{
pixbuf_renderer_overlay_remove((PixbufRenderer *)imd->pr, id);
if (osd->show & OSD_SHOW_INFO)
{
- /* redraw when the image was changed,
+ /* redraw when the image was changed,
with histogram we have to redraw also when loading is finished */
if (osd->changed_states & IMAGE_STATE_IMAGE ||
(osd->changed_states & IMAGE_STATE_LOADING && osd->show & OSD_SHOW_HISTOGRAM) ||
g_free(osd);
}
-#if 0
-static void image_osd_remove(ImageWindow *imd)
-{
- OverlayStateData *osd = image_get_osd_data(imd);
-
- if (osd) image_osd_free(osd);
-}
-#endif
-
static void image_osd_destroy_cb(GtkWidget *widget, gpointer data)
{
OverlayStateData *osd = data;