Changeset 69365

Timestamp:

Sep 4, 2016, 9:54:56 AM (8 years ago)

Author:

Nikos Alexandris

Message:

i.rgb.his (sandbox): set hue to NULL if achromatic case is true

File:

• sandbox/alexandris/i.rgb.his/rgb2his.c (modified) (4 diffs)

sandbox/alexandris/i.rgb.his/rgb2his.c

@@ -20 +20 @@
 #include <math.h>
 
+/*
+ * (input/output) rowbuffer
+ * columns
+ * maximum level of range 2^bit_depth
+ */
 
 void rgb2his(DCELL *rowbuffer[3], int columns, double max_level)
+
 {
     int column;         /* column indicator               */
@@ -36 +42 @@
 for (column = 0; column < columns; column++) {
 
-        if (Rast_is_d_null_value(&rowbuffer[0][column]) ||
-            Rast_is_d_null_value(&rowbuffer[1][column]) ||
-            Rast_is_d_null_value(&rowbuffer[2][column])) {
+    if (Rast_is_d_null_value(&rowbuffer[0][column]) ||
+        Rast_is_d_null_value(&rowbuffer[1][column]) ||
+        Rast_is_d_null_value(&rowbuffer[2][column])) {
             Rast_set_d_null_value(&rowbuffer[0][column], 1);
             Rast_set_d_null_value(&rowbuffer[1][column], 1);
@@ -84 +90 @@
 
         /* undefined -- (how to) set to NULL? */
-        hue = 0.0;
+        hue = -1;
 
-        rowbuffer[0][column] = (FCELL)hue;
-        rowbuffer[1][column] = (FCELL)saturation;
-        rowbuffer[2][column] = (FCELL)lightness;
     }
 
@@ -113 +116 @@
             hue += 360.0;
 
-        /* HSL output values */
+    }
+
+    /* HSL output values */
+    if (hue == -1.0) {
+            Rast_set_d_null_value(&rowbuffer[0][column], 1);
+    }
+    else
+    {
         rowbuffer[0][column] = (FCELL)hue;
-        rowbuffer[1][column] = (FCELL)saturation;
-        rowbuffer[2][column] = (FCELL)lightness;
     }
+
+    rowbuffer[1][column] = (FCELL)saturation;
+    rowbuffer[2][column] = (FCELL)lightness;
 
     G_debug(2, "Output rowbuffers 0, 1, 2: %f, %f, %f\n",