Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/cpPlugins

Windows/Linux synch

diff --combined lib/cpPlugins/Plugins/RGBImageToHSVChannelsFilter.h
index 2f61c3e20b9680a1cec44bba08451782527f5231,f995835c4a29b05316fee79c0c8a00ce269ae278..5be93b2dd0ae5ab9f2f76d7b1d81c234cd9eb8e6
--- 1/lib/cpPlugins/Plugins/RGBImageToHSVChannelsFilter.h
--- 2/lib/cpPlugins/Plugins/RGBImageToHSVChannelsFilter.h
+++ b/lib/cpPlugins/Plugins/RGBImageToHSVChannelsFilter.h
@@@ -19,6 -19,9 +19,6 @@@ namespace cpPlugin
        typedef itk::SmartPointer< Self >                Pointer;
        typedef itk::SmartPointer< const Self >          ConstPointer;
  
 -      typedef Superclass::TParameter  TParameter;
 -      typedef Superclass::TParameters TParameters;
 -
      public:
        itkNewMacro( Self );
        itkTypeMacro(
@@@ -36,10 -39,10 +36,10 @@@
        virtual std::string _GenerateData( );
  
        template< unsigned int D >
 -      std::string _GD0( );
 +        std::string _GD0( );
  
        template< class P, unsigned int D >
 -      std::string _GD1( );
 +        std::string _GD1( );
  
      private:
        // Purposely not implemented
@@@ -48,10 -51,7 +48,7 @@@
      };
  
      // ---------------------------------------------------------------------
-     PLUMA_INHERIT_PROVIDER_CPPLUGINS(
-       RGBImageToHSVChannelsFilter,
-       cpPlugins::Interface::Object
-       );
+     CPPLUGINS_INHERIT_PROVIDER( RGBImageToHSVChannelsFilter );
  
    } // ecapseman