gnuastro-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnuastro-commits] master 407996b: ConvertType: corrected missing conver


From: Mohammad Akhlaghi
Subject: [gnuastro-commits] master 407996b: ConvertType: corrected missing conversion in SLS colormap
Date: Sun, 11 Aug 2019 11:22:02 -0400 (EDT)

branch: master
commit 407996b1092f481d86776c83c0cd1bd84af246d4
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>

    ConvertType: corrected missing conversion in SLS colormap
    
    Until now, we were missing the case where the checked fraction in the SLS
    color map is `159', as a result, when an element's value fell in this
    range, it would become black. This was a typo for the time I was writing
    this step!
    
    After checking with SAO DS9 (which has the original SLS color-map
    definition), I noticed that the values are indeed in sequence (so I hadn't
    missed any line). I had just miss-typed `159' with `160'.
    
    This fixes bug #56747.
---
 NEWS                 |  3 ++-
 bin/convertt/color.c | 67 ++++++++++++++++++++++++++--------------------------
 2 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/NEWS b/NEWS
index e96b712..8600137 100644
--- a/NEWS
+++ b/NEWS
@@ -17,7 +17,8 @@ See the end of the file for license conditions.
 ** Changed features
 
 ** Bugs fixed
-  bug #56736: CosmicCalculator crash when a single value given to --obsline
+  bug #56736: CosmicCalculator crash when a single value given to --obsline.
+  bug #56747: ConvertType's SLS colormap has black pixels which should be 
orange.
 
 
 
diff --git a/bin/convertt/color.c b/bin/convertt/color.c
index bdd8daa..fc92a62 100644
--- a/bin/convertt/color.c
+++ b/bin/convertt/color.c
@@ -367,39 +367,40 @@ color_from_mono_sls(struct converttparams *p)
           case 156: *r=1.000000; *g=0.394800; *b=0.000000; break;
           case 157: *r=0.998342; *g=0.361900; *b=0.000000; break;
           case 158: *r=0.996683; *g=0.329000; *b=0.000000; break;
-          case 160: *r=0.995025; *g=0.296100; *b=0.000000; break;
-          case 161: *r=0.993367; *g=0.263200; *b=0.000000; break;
-          case 162: *r=0.991708; *g=0.230300; *b=0.000000; break;
-          case 163: *r=0.990050; *g=0.197400; *b=0.000000; break;
-          case 164: *r=0.988392; *g=0.164500; *b=0.000000; break;
-          case 165: *r=0.986733; *g=0.131600; *b=0.000000; break;
-          case 166: *r=0.985075; *g=0.098700; *b=0.000000; break;
-          case 167: *r=0.983417; *g=0.065800; *b=0.000000; break;
-          case 168: *r=0.981758; *g=0.032900; *b=0.000000; break;
-          case 169: *r=0.980100; *g=0.000000; *b=0.000000; break;
-          case 170: *r=0.955925; *g=0.000000; *b=0.000000; break;
-          case 171: *r=0.931750; *g=0.000000; *b=0.000000; break;
-          case 172: *r=0.907575; *g=0.000000; *b=0.000000; break;
-          case 173: *r=0.883400; *g=0.000000; *b=0.000000; break;
-          case 174: *r=0.859225; *g=0.000000; *b=0.000000; break;
-          case 175: *r=0.835050; *g=0.000000; *b=0.000000; break;
-          case 176: *r=0.810875; *g=0.000000; *b=0.000000; break;
-          case 177: *r=0.786700; *g=0.000000; *b=0.000000; break;
-          case 178: *r=0.762525; *g=0.000000; *b=0.000000; break;
-          case 179: *r=0.738350; *g=0.000000; *b=0.000000; break;
-          case 180: *r=0.714175; *g=0.000000; *b=0.000000; break;
-          case 181: *r=0.690000; *g=0.000000; *b=0.000000; break;
-          case 182: *r=0.715833; *g=0.083333; *b=0.083333; break;
-          case 183: *r=0.741667; *g=0.166667; *b=0.166667; break;
-          case 184: *r=0.767500; *g=0.250000; *b=0.250000; break;
-          case 185: *r=0.793333; *g=0.333333; *b=0.333333; break;
-          case 186: *r=0.819167; *g=0.416667; *b=0.416667; break;
-          case 187: *r=0.845000; *g=0.500000; *b=0.500000; break;
-          case 188: *r=0.870833; *g=0.583333; *b=0.583333; break;
-          case 189: *r=0.896667; *g=0.666667; *b=0.666667; break;
-          case 190: *r=0.922500; *g=0.750000; *b=0.750000; break;
-          case 191: *r=0.948333; *g=0.833333; *b=0.833333; break;
-          case 192: *r=0.974167; *g=0.916667; *b=0.916667; break;
+          case 159: *r=0.995025; *g=0.296100; *b=0.000000; break;
+          case 160: *r=0.993367; *g=0.263200; *b=0.000000; break;
+          case 161: *r=0.991708; *g=0.230300; *b=0.000000; break;
+          case 162: *r=0.990050; *g=0.197400; *b=0.000000; break;
+          case 163: *r=0.988392; *g=0.164500; *b=0.000000; break;
+          case 164: *r=0.986733; *g=0.131600; *b=0.000000; break;
+          case 165: *r=0.985075; *g=0.098700; *b=0.000000; break;
+          case 166: *r=0.983417; *g=0.065800; *b=0.000000; break;
+          case 167: *r=0.981758; *g=0.032900; *b=0.000000; break;
+          case 168: *r=0.980100; *g=0.000000; *b=0.000000; break;
+          case 169: *r=0.955925; *g=0.000000; *b=0.000000; break;
+          case 170: *r=0.931750; *g=0.000000; *b=0.000000; break;
+          case 171: *r=0.907575; *g=0.000000; *b=0.000000; break;
+          case 172: *r=0.883400; *g=0.000000; *b=0.000000; break;
+          case 173: *r=0.859225; *g=0.000000; *b=0.000000; break;
+          case 174: *r=0.835050; *g=0.000000; *b=0.000000; break;
+          case 175: *r=0.810875; *g=0.000000; *b=0.000000; break;
+          case 176: *r=0.786700; *g=0.000000; *b=0.000000; break;
+          case 177: *r=0.762525; *g=0.000000; *b=0.000000; break;
+          case 178: *r=0.738350; *g=0.000000; *b=0.000000; break;
+          case 179: *r=0.714175; *g=0.000000; *b=0.000000; break;
+          case 180: *r=0.690000; *g=0.000000; *b=0.000000; break;
+          case 181: *r=0.715833; *g=0.083333; *b=0.083333; break;
+          case 182: *r=0.741667; *g=0.166667; *b=0.166667; break;
+          case 183: *r=0.767500; *g=0.250000; *b=0.250000; break;
+          case 184: *r=0.793333; *g=0.333333; *b=0.333333; break;
+          case 185: *r=0.819167; *g=0.416667; *b=0.416667; break;
+          case 186: *r=0.845000; *g=0.500000; *b=0.500000; break;
+          case 187: *r=0.870833; *g=0.583333; *b=0.583333; break;
+          case 188: *r=0.896667; *g=0.666667; *b=0.666667; break;
+          case 189: *r=0.922500; *g=0.750000; *b=0.750000; break;
+          case 190: *r=0.948333; *g=0.833333; *b=0.833333; break;
+          case 191: *r=0.974167; *g=0.916667; *b=0.916667; break;
+          case 192: *r=1.000000; *g=1.000000; *b=1.000000; break;
           case 193: *r=1.000000; *g=1.000000; *b=1.000000; break;
           case 194: *r=1.000000; *g=1.000000; *b=1.000000; break;
           case 195: *r=1.000000; *g=1.000000; *b=1.000000; break;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]