From 70a9a84017567e7ba2c8309b1d236d796d0b5d6f Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Thu, 15 Apr 2004 14:17:51 +0000 Subject: [PATCH] applied patch from Marco Munari that removes a redundant "if" (bug 2004-04-15 Sven Neumann * libgimpcolor/gimpcolorspace.c (gimp_rgb_to_hsv): applied patch from Marco Munari that removes a redundant "if" (bug #133540). --- ChangeLog | 5 +++++ libgimpcolor/gimpcolorspace.c | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ecce0a6bcf..1992df218e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-04-15 Sven Neumann + + * libgimpcolor/gimpcolorspace.c (gimp_rgb_to_hsv): applied patch + from Marco Munari that removes a redundant "if" (bug #133540). + 2004-04-15 Sven Neumann * plug-ins/ifscompose/ifscompose.c: applied patch from Yeti that diff --git a/libgimpcolor/gimpcolorspace.c b/libgimpcolor/gimpcolorspace.c index e78ebef6b4..9f069847d7 100644 --- a/libgimpcolor/gimpcolorspace.c +++ b/libgimpcolor/gimpcolorspace.c @@ -72,6 +72,8 @@ gimp_rgb_to_hsv (const GimpRGB *rgb, if (rgb->r == max) { hsv->h = (rgb->g - rgb->b) / delta; + if (hsv->h < 0.0) + hsv->h += 6.0; } else if (rgb->g == max) { @@ -83,11 +85,6 @@ gimp_rgb_to_hsv (const GimpRGB *rgb, } hsv->h /= 6.0; - - if (hsv->h < 0.0) - hsv->h += 1.0; - else if (hsv->h > 1.0) - hsv->h -= 1.0; } else {