summaryrefslogtreecommitdiff
path: root/src/xsane-gamma.c
diff options
context:
space:
mode:
authorJulien BLACHE <jblache@debian.org>2007-02-27 22:22:40 +0100
committerMattia Rizzolo <mattia@mapreri.org>2014-10-03 14:05:34 +0000
commit4d8384e7b116e3eb11cc3df9151c8554dbca95fc (patch)
treef049f1240de8a8a971a621a4a3891d5eab2839a1 /src/xsane-gamma.c
parent92f35807f68b30405639d4e0a95f748b6bdb793f (diff)
parent129ed4b29e21fdb8bda3bee89c3e5d8cca6ba749 (diff)
Imported Debian patch 0.993-1debian/0.993-1
Diffstat (limited to 'src/xsane-gamma.c')
-rw-r--r--src/xsane-gamma.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/xsane-gamma.c b/src/xsane-gamma.c
index 40fe835..8304f07 100644
--- a/src/xsane-gamma.c
+++ b/src/xsane-gamma.c
@@ -3,7 +3,7 @@
xsane-gamma.c
Oliver Rauch <Oliver.Rauch@rauch-domain.de>
- Copyright (C) 1998-2005 Oliver Rauch
+ Copyright (C) 1998-2007 Oliver Rauch
This file is part of the XSANE package.
This program is free software; you can redistribute it and/or modify
@@ -132,7 +132,7 @@ static void xsane_draw_histogram_with_points(XsanePixmap *hist,
{
inten = show_inten * count[i] * scale;
- if (xsane.xsane_colors > 1)
+ if (xsane.xsane_channels > 1)
{
red = show_red * count_red[i] * scale;
green = show_green * count_green[i] * scale;
@@ -208,7 +208,7 @@ static void xsane_draw_histogram_with_lines(XsanePixmap *hist,
{
inten = show_inten * count[i] * scale;
- if (xsane.xsane_colors > 1)
+ if (xsane.xsane_channels > 1)
{
red = show_red * count_red[i] * scale;
green = show_green * count_green[i] * scale;
@@ -518,7 +518,7 @@ void xsane_update_sliders()
xsane_update_slider(&xsane.slider_gray);
- if ( (xsane.xsane_colors > 1) && (!xsane.enhancement_rgb_default) )
+ if ( (xsane.xsane_channels > 1) && (!xsane.enhancement_rgb_default) && (!xsane.enable_color_management))
{
xsane_update_slider(&xsane.slider_red);
xsane_update_slider(&xsane.slider_green);
@@ -539,7 +539,7 @@ void xsane_update_sliders()
xsane.slider_green.active = XSANE_SLIDER_INACTIVE; /* mark slider inactive */
xsane.slider_blue.active = XSANE_SLIDER_INACTIVE; /* mark slider inactive */
- if (xsane.param.depth == 1)
+ if ((xsane.param.depth == 1) || (xsane.enable_color_management))
{
xsane_draw_slider_level(&xsane.slider_gray); /* remove slider */
xsane.slider_gray.active = XSANE_SLIDER_INACTIVE; /* mark slider inactive */
@@ -1599,7 +1599,7 @@ void xsane_update_gamma_curve(int update_raw)
xsane.brightness + xsane.brightness_blue,
xsane.contrast + xsane.contrast_blue , xsane.preview_gamma_size, 255);
#else
- if ( ( ( (xsane.xsane_colors > 1) && xsane.scanner_gamma_color ) || /* color scan and gamma table for red, green and blue available */
+ if ( ( ( (xsane.xsane_channels > 1) && xsane.scanner_gamma_color ) || /* color scan and gamma table for red, green and blue available */
xsane.scanner_gamma_gray ) && /* grayscale scan and gamma table for gray available */
(!xsane.no_preview_medium_gamma) ) /* do not use gamma table when disabled */
{
@@ -1663,7 +1663,7 @@ void xsane_update_gamma_curve(int update_raw)
xsane.preview_gamma_size);
}
}
- else if (xsane.xsane_colors > 1) /* color scan, no color scanner gamma tables available */
+ else if (xsane.xsane_channels > 1) /* color scan, no color scanner gamma tables available */
{
DBG(DBG_info, "creating preview gamma tables with medium correction\n");
@@ -1826,13 +1826,18 @@ static void xsane_enhancement_update(void)
return;
}
+ if (xsane.enable_color_management) /* color management? no gamma */
+ {
+ return;
+ }
+
xsane.block_enhancement_update = TRUE;
gtk_adjustment_set_value(GTK_ADJUSTMENT(xsane.gamma_widget), xsane.gamma);
gtk_adjustment_set_value(GTK_ADJUSTMENT(xsane.brightness_widget), xsane.brightness);
gtk_adjustment_set_value(GTK_ADJUSTMENT(xsane.contrast_widget), xsane.contrast);
- if ( (xsane.xsane_colors > 1) && (!xsane.enhancement_rgb_default) )
+ if ( (xsane.xsane_channels > 1) && (!xsane.enhancement_rgb_default) )
{
gtk_adjustment_set_value(GTK_ADJUSTMENT(xsane.gamma_red_widget), xsane.gamma_red);
gtk_adjustment_set_value(GTK_ADJUSTMENT(xsane.brightness_red_widget), xsane.brightness_red);
@@ -2107,7 +2112,7 @@ void xsane_enhancement_by_histogram(int update_gamma)
xsane.contrast = gray_contrast;
}
- if ( (xsane.xsane_colors > 1) && (!xsane.enhancement_rgb_default) ) /* rgb sliders active */
+ if ( (xsane.xsane_channels > 1) && (!xsane.enhancement_rgb_default) ) /* rgb sliders active */
{
if ((xsane.slider_gray.active == XSANE_SLIDER_ACTIVE) ||
(xsane.slider_gray.active == XSANE_SLIDER_INACTIVE)) /* gray slider not moved */