...

[cpPlugins.git] / lib / cpExtensions / Algorithms / RGBToYPbPrFunction.h

diff --git a/lib/cpExtensions/Algorithms/RGBToYPbPrFunction.h b/lib/cpExtensions/Algorithms/RGBToYPbPrFunction.h
index fb9da023cbd1d65dc841dc71fb3ab99b97354885..83085fea0301c9bafdb9a956c6baf624eb9e052b 100644 (file)
--- a/lib/cpExtensions/Algorithms/RGBToYPbPrFunction.h
+++ b/lib/cpExtensions/Algorithms/RGBToYPbPrFunction.h
@@ -20,29 +20,36 @@ namespace cpExtensions
   {
     /**
      */
-    template< class O >
+    template< class P >
     struct RGBToYPbPrFunction
     {
-      typedef RGBToYPbPrFunction  Self;
-      typedef itk::Vector< O, 3 > TOutPixel;
+      typedef RGBToYPbPrFunction    Self;
+      typedef P                     TOutPixel;
+      typedef typename P::ValueType TValue;
 
       template< class Tr, class Tg, class Tb >
-      TOutPixel operator()( const Tr& r, const Tg& g, const Tb& b ) const
+      P operator()( const Tr& r, const Tg& g, const Tb& b ) const
         {
-          static const O M[] =
+          static const double M[] =
             {
-              O(  0.2990 ), O(  0.5870 ), O(  0.1140 ),
-              O( -0.1687 ), O( -0.3313 ), O(  0.5000 ),
-              O(  0.5000 ), O( -0.4187 ), O( -0.0813 )
+              double(  0.2990 ), double(  0.5870 ), double(  0.1140 ),
+              double( -0.1687 ), double( -0.3313 ), double(  0.5000 ),
+              double(  0.5000 ), double( -0.4187 ), double( -0.0813 )
             };
-          static const vnl_matrix< O > vM( M, 3, 3 );
-          static const itk::Matrix< O, 3, 3 > iM( vM );
+          static const vnl_matrix< double > vM( M, 3, 3 );
+          static const itk::Matrix< double, 3, 3 > iM( vM );
 
-          TOutPixel rgb;
-          rgb[ 0 ] = O( r );
-          rgb[ 1 ] = O( g );
-          rgb[ 2 ] = O( b );
-          return( iM * rgb );
+          itk::Vector< double, 3 > rgb;
+          rgb[ 0 ] = double( r );
+          rgb[ 1 ] = double( b );
+          rgb[ 2 ] = double( g );
+          rgb = iM * rgb;
+
+          P out;
+          out[ 0 ] = TValue( rgb[ 0 ] );
+          out[ 1 ] = TValue( rgb[ 1 ] );
+          out[ 2 ] = TValue( rgb[ 2 ] );
+          return( out );
         }
 
       template< class C >