Introduce helpers histogram_toggle_channel() and histogram_toggle_mode().

diff --git a/src/histogram.c b/src/histogram.c
index 165fba5..cc19d37 100644 (file)
--- a/src/histogram.c
+++ b/src/histogram.c
@@ -97,6 +97,18 @@ gint histogram_get_mode(Histogram *histogram)
        return histogram->log_mode;
 }
 
+gint histogram_toggle_channel(Histogram *histogram)
+{
+       if (!histogram) return 0;
+       return histogram_set_channel(histogram, (histogram_get_channel(histogram)+1)%HCHAN_COUNT);
+}
+
+gint histogram_toggle_mode(Histogram *histogram)
+{
+       if (!histogram) return 0;
+       return histogram_set_mode(histogram, !histogram_get_mode(histogram));
+}
+
 const gchar *histogram_label(Histogram *histogram)
 {
        const gchar *t1 = "";

diff --git a/src/histogram.h b/src/histogram.h
index cdd5ef2..5d9da01 100644 (file)
--- a/src/histogram.h
+++ b/src/histogram.h
@@ -28,6 +28,8 @@ gint histogram_set_channel(Histogram *histogram, gint chan);
 gint histogram_get_channel(Histogram *histogram);
 gint histogram_set_mode(Histogram *histogram, gint mode);
 gint histogram_get_mode(Histogram *histogram);
+gint histogram_toggle_channel(Histogram *histogram);
+gint histogram_toggle_mode(Histogram *histogram);
 const gchar *histogram_label(Histogram *histogram);
 const HistMap *histmap_get(FileData *fd);
 gint histogram_draw(Histogram *histogram, const HistMap *histmap, GdkPixbuf *pixbuf, gint x, gint y, gint width, gint height);

diff --git a/src/image-overlay.c b/src/image-overlay.c
index b117915..b404fa6 100644 (file)
--- a/src/image-overlay.c
+++ b/src/image-overlay.c
@@ -130,7 +130,7 @@ void image_osd_histogram_chan_toggle(ImageWindow *imd)
 
        if (!osd || !osd->histogram) return;
 
-       histogram_set_channel(osd->histogram, (histogram_get_channel(osd->histogram) +1)%HCHAN_COUNT);
+       histogram_toggle_channel(osd->histogram);
        image_osd_update(imd);
 }
 
@@ -140,7 +140,7 @@ void image_osd_histogram_log_toggle(ImageWindow *imd)
 
        if (!osd || !osd->histogram) return;
 
-       histogram_set_mode(osd->histogram, !histogram_get_mode(osd->histogram));
+       histogram_toggle_mode(osd->histogram);
        image_osd_update(imd);
 }