From: Leonardo Florez-Valencia <florez-l@javeriana.edu.co>
Date: Mon, 2 Nov 2015 23:48:50 +0000 (-0500)
Subject: Glitch hunted down
X-Git-Tag: v0.1~309
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=dc7b0175c06fcd6bd7a6d475a2592336953dad36;p=cpPlugins.git

Glitch hunted down
---

diff --git a/lib/cpExtensions/Visualization/ImageBlender.cxx b/lib/cpExtensions/Visualization/ImageBlender.cxx
index 6714d55..d5cbbd4 100644
--- a/lib/cpExtensions/Visualization/ImageBlender.cxx
+++ b/lib/cpExtensions/Visualization/ImageBlender.cxx
@@ -1,6 +1,5 @@
 #include <cpExtensions/Visualization/ImageBlender.h>
 
-#include <cmath>
 #include <cstring>
 
 #include <vtkDataObject.h>
@@ -135,8 +134,10 @@ GetColor(
   }
   else
   {
-    r = double( 1 );
-    g = b = double( 0 );
+    TColor c;
+    r = c.R;
+    g = c.G;
+    b = c.B;
 
   } // fi
 }
@@ -390,12 +391,10 @@ _GenerateData(
             );
           if( c > double( 0 ) )
           {
-            double cr, cg, cb;
-            this->GetColor( i, cr, cg, cb );
-            double n = std::sqrt( ( cr * cr ) + ( cg * cg ) + ( cb * cb ) );
-            r *= cr * n;
-            g *= cg * n;
-            b *= cb * n;
+            TColor rgb = this->m_Colors[ i ];
+            r *= rgb.R * rgb.N;
+            g *= rgb.G * rgb.N;
+            b *= rgb.B * rgb.N;
             a = _1;
 
           } // fi
diff --git a/lib/cpExtensions/Visualization/ImageBlender.h b/lib/cpExtensions/Visualization/ImageBlender.h
index 6ba1a43..f122822 100644
--- a/lib/cpExtensions/Visualization/ImageBlender.h
+++ b/lib/cpExtensions/Visualization/ImageBlender.h
@@ -3,7 +3,9 @@
 
 #include <cpExtensions/cpExtensions_Export.h>
 
+#include <cmath>
 #include <map>
+
 #include <vtkThreadedImageAlgorithm.h>
 
 namespace cpExtensions
@@ -84,7 +86,7 @@ namespace cpExtensions
     protected:
       struct TColor
       {
-        double R, G, B;
+        double R, G, B, N;
         TColor(
           const double& r = double( 1 ),
           const double& g = double( 0 ),
@@ -93,7 +95,9 @@ namespace cpExtensions
           : R( r ),
             G( g ),
             B( b )
-          { }
+          {
+            this->N = std::sqrt( ( r * r ) + ( g * g ) + ( b * b ) );
+          }
       };
       mutable std::map< unsigned int, TColor > m_Colors;