diff --git a/imagelib/effects/kpEffectHSV.cpp b/imagelib/effects/kpEffectHSV.cpp
index 4131b1a8..3d8e01b6 100644
--- a/imagelib/effects/kpEffectHSV.cpp
+++ b/imagelib/effects/kpEffectHSV.cpp
@@ -1,191 +1,189 @@
 
 /*
    Copyright (c) 2007 Mike Gashler <gashlerm@yahoo.com>
    All rights reserved.
 
    Redistribution and use in source and binary forms, with or without
    modification, are permitted provided that the following conditions
    are met:
 
    1. Redistributions of source code must retain the above copyright
       notice, this list of conditions and the following disclaimer.
    2. Redistributions in binary form must reproduce the above copyright
       notice, this list of conditions and the following disclaimer in the
       documentation and/or other materials provided with the distribution.
 
    THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
    IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
    OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
    IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
    INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
    NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
    DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
    THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 // TODO: Clarence's code review
 
 #include "kpEffectHSV.h"
 
 #include <cmath>
 
 #include <QBitmap>
 #include <QImage>
 
 #include "kpLogCategories.h"
 
 #include "pixmapfx/kpPixmapFX.h"
 
 
 static void ColorToHSV(unsigned int c, float* pHue, float* pSaturation, float* pValue)
 {
     int r = qRed(c);
     int g = qGreen(c);
     int b = qBlue(c);
     int min{};
     if(b >= g && b >= r)
     {
         // Blue
         min = qMin(r, g);
         if(b != min)
         {
             *pHue = static_cast<float> (r - g) / ((b - min) * 6) + static_cast<float> (2) / 3;
             *pSaturation = 1.0f - static_cast<float> (min) / static_cast<float> (b);
         }
         else
         {
             *pHue = 0;
             *pSaturation = 0;
         }
         *pValue = static_cast<float> (b) / 255;
     }
     else if(g >= r)
     {
         // Green
         min = qMin(b, r);
         if(g != min)
         {
             *pHue = static_cast<float> (b - r) / ((g - min) * 6) + static_cast<float> (1) / 3;
             *pSaturation = 1.0f - static_cast<float> (min) / static_cast<float> (g);
         }
         else
         {
             *pHue = 0;
             *pSaturation = 0;
         }
         *pValue = static_cast<float> (g) / 255;
     }
     else
     {
         // Red
         min = qMin(g, b);
         if(r != min)
         {
             *pHue = static_cast<float> (g - b) / ((r - min) * 6);
             if(*pHue < 0) {
                 (*pHue) += 1.0f;
             }
             *pSaturation = 1.0f - static_cast<float> (min) / static_cast<float> (r);
         }
         else
         {
             *pHue = 0;
             *pSaturation = 0;
         }
         *pValue = static_cast<float> (r) / 255;
     }
 }
 
 static unsigned int HSVToColor(int alpha, float hue, float saturation, float value)
 {
-    //Q_ASSERT (hue >= 0 && hue <= 1 && saturation >= 0 && saturation <= 1 && value >= 0 && value <= 1);
-
     hue *= 5.999999f;
     int h = static_cast<int> (hue);
     float f = hue - h;
-    float p = value * (1.0f - saturation);
-    float q = value * (1.0f - ((h & 1) == 0 ? 1.0f - f : f) * saturation);
+    float p = value * (1.0 - saturation);
+    float q = value * (1.0 - ((h & 1) == 0 ? 1.0 - f : f) * saturation);
     switch(h)
     {
-        case 0: return qRgba(static_cast<int> (value * 255.999999f),
-                             static_cast<int> (q * 255.999999f),
-                             static_cast<int> (p * 255.999999f), alpha);
+        case 0: return qRgba(static_cast<int> (value * 255.999999),
+                             static_cast<int> (q * 255.999999),
+                             static_cast<int> (p * 255.999999), alpha);
 
-        case 1: return qRgba(static_cast<int> (q * 255.999999f),
-                             static_cast<int> (value * 255.999999f),
-                             static_cast<int> (p * 255.999999f), alpha);
+        case 1: return qRgba(static_cast<int> (q * 255.999999),
+                             static_cast<int> (value * 255.999999),
+                             static_cast<int> (p * 255.999999), alpha);
 
-        case 2: return qRgba(static_cast<int> (p * 255.999999f),
-                             static_cast<int> (value * 255.999999f),
-                             static_cast<int> (q * 255.999999f), alpha);
+        case 2: return qRgba(static_cast<int> (p * 255.999999),
+                             static_cast<int> (value * 255.999999),
+                             static_cast<int> (q * 255.999999), alpha);
 
-        case 3: return qRgba(static_cast<int> (p * 255.999999f),
-                             static_cast<int> (q * 255.999999f),
-                             static_cast<int> (value * 255.999999f), alpha);
+        case 3: return qRgba(static_cast<int> (p * 255.999999),
+                             static_cast<int> (q * 255.999999),
+                             static_cast<int> (value * 255.999999), alpha);
 
-        case 4: return qRgba(static_cast<int> (q * 255.999999f),
-                             static_cast<int> (p * 255.999999f),
-                             static_cast<int> (value * 255.999999f), alpha);
+        case 4: return qRgba(static_cast<int> (q * 255.999999),
+                             static_cast<int> (p * 255.999999),
+                             static_cast<int> (value * 255.999999), alpha);
 
-        case 5: return qRgba(static_cast<int> (value * 255.999999f),
-                             static_cast<int> (p * 255.999999f),
-                             static_cast<int> (q * 255.999999f), alpha);
+        case 5: return qRgba(static_cast<int> (value * 255.999999),
+                             static_cast<int> (p * 255.999999),
+                             static_cast<int> (q * 255.999999), alpha);
     }
     return qRgba(0, 0, 0, alpha);
 }
 
 static QRgb AdjustHSVInternal (QRgb pix, double hueDiv360, double saturation, double value)
 {
     float h, s, v;
     ::ColorToHSV(pix, &h, &s, &v);
     
     const int alpha = qAlpha(pix);
 
     h += static_cast<float> (hueDiv360);
     h -= std::floor(h);
 
-    s = qMax(0.0f, qMin(1.0f, s + static_cast<float> (saturation)));
+    s = qMax(0.0f, qMin(static_cast<float>(1), s + static_cast<float> (saturation)));
 
-    v = qMax(0.0f, qMin(1.0f, v + static_cast<float> (value)));
+    v = qMax(0.0f, qMin(static_cast<float>(1), v + static_cast<float> (value)));
 
     return ::HSVToColor(alpha, h, s, v);
 }
 
 static void AdjustHSV (QImage* pImage, double hue, double saturation, double value)
 {
     hue /= 360;
 
     if (pImage->depth () > 8)
     {
         for (int y = 0; y < pImage->height (); y++)
         {
             for (int x = 0; x < pImage->width (); x++)
             {
                 QRgb pix = pImage->pixel (x, y);
                 pix = ::AdjustHSVInternal (pix, hue, saturation, value);
                 pImage->setPixel (x, y, pix);
             }
         }
     }
     else
     {
         for (int i = 0; i < pImage->colorCount (); i++)
         {
             QRgb pix = pImage->color (i);
             pix = ::AdjustHSVInternal (pix, hue, saturation, value);
             pImage->setColor (i, pix);
         }
     }
 }
 
 // public static
 kpImage kpEffectHSV::applyEffect (const kpImage &image,
                                   double hue, double saturation, double value)
 {
     QImage qimage(image);
     ::AdjustHSV (&qimage, hue, saturation, value);
     return qimage;
 }