X-Git-Url: http://git.euphorik.ch/?a=blobdiff_plain;f=WCudaMSE%2FBilatTools_CPP%2Fsrc%2Fcore%2Ftools%2Fheader%2Fnamespace_cpu%2FIndiceTools_CPU.h;h=1c3027ea477b34a0e40c97f4a03b180ab5bdd7d4;hb=f8259dce248a4411c3bc64cecb9fc268c4fd81d6;hp=89e2f3e1e712007deac5a74230b8988aa5c056ae;hpb=8d08c12b29c2a14684f35c023ee39e694bb80d25;p=GPU.git

diff --git a/WCudaMSE/BilatTools_CPP/src/core/tools/header/namespace_cpu/IndiceTools_CPU.h b/WCudaMSE/BilatTools_CPP/src/core/tools/header/namespace_cpu/IndiceTools_CPU.h
index 89e2f3e..1c3027e 100755
--- a/WCudaMSE/BilatTools_CPP/src/core/tools/header/namespace_cpu/IndiceTools_CPU.h
+++ b/WCudaMSE/BilatTools_CPP/src/core/tools/header/namespace_cpu/IndiceTools_CPU.h
@@ -1,6 +1,8 @@
 #ifndef INDICE_TOOLS_CPU_H_
 #define INDICE_TOOLS_CPU_H_
 
+#include "cudaType_CPU.h"
+
 /*----------------------------------------------------------------------*\
  |*			Declaration 					*|
  \*---------------------------------------------------------------------*/
@@ -12,41 +14,45 @@
 namespace cpu
     {
     class IndiceTools
-	{
+        {
 
-	    /*--------------------------------------*\
+            /*--------------------------------------*\
 	    |*		Constructor		    *|
-	     \*--------------------------------------*/
+             \*--------------------------------------*/
 
-	public:
+        public:
 
-	    /*--------------------------------------*\
+            /*--------------------------------------*\
 	    |*		Methodes		    *|
-	     \*--------------------------------------*/
+             \*--------------------------------------*/
 
-	public:
+        public:
 
-	    /**
-	     * s[0,W*H[ --> i[0,H[ j[0,W[
-	     */
-	    static void toIJ( int s, int W, int* ptri, int* ptrj);
+            /**
+             * s[0,W*H[ --> i[0,H[ j[0,W[
+             */
+            static void toIJ(int s, int w, int* ptri, int* ptrj);
 
-	    /**
-	     * i[0,H[ j[0,W[ --> s[0,W*H[
-	     */
-	    static  int toS(int W, int i, int j);
+            /**
+             * s[0,W*H[ --> x[0,W[ y[0,H[
+             */
+            static float2 toPixelFloat(int s, int w);
 
+            /**
+             * i[0,H[ j[0,W[ --> s[0,W*H[
+             */
+            static int toS(int w, int i, int j);
 
-	    /*-------------------------------------*\
+            /*-------------------------------------*\
 	     |*		Attributs		    *|
-	     \*-------------------------------------*/
+             \*-------------------------------------*/
 
-	private:
+        private:
 
-	};
+        };
     }
 
-#endif 
+#endif
 
 /*----------------------------------------------------------------------*\
  |*			End	 					*|