last version

[book_gpu.git] / BookGPU / Chapters / chapter3 / code / kernMedianForget1pix3.cu~

diff --git a/BookGPU/Chapters/chapter3/code/kernMedianForget1pix3.cu~ b/BookGPU/Chapters/chapter3/code/kernMedianForget1pix3.cu~
index c842715fb03d6fa64955b2599e78e5c29909b4cc..a34d7845d6a422c4d90ab912d0cdd528289296b2 100755 (executable)
--- a/BookGPU/Chapters/chapter3/code/kernMedianForget1pix3.cu~
+++ b/BookGPU/Chapters/chapter3/code/kernMedianForget1pix3.cu~
@@ -1,13 +1,7 @@
 __device__ inline void s(int* a, int* b)
 __device__ inline void s(int* a, int* b)

-{
-  
+{  

   int tmp ;
   int tmp ;

-  if (*a > *b)
-       {
-         tmp = *b ;
-         *b = *a ;
-         *a = tmp ;
-         }
+  if (*a > *b) { tmp = *b; *b = *a; *a = tmp;}

 }
 
 #define min3(a, b, c) s(a, b); s(a, c);
 }
 
 #define min3(a, b, c) s(a, b); s(a, c);


@@ -17,52 +11,28 @@ __device__ inline void s(int* a, int* b)
 #define minmax5(a, b, c, d, e) s(a, b); s(c, d); min3(a, c, e); max3(b, d, e);
 #define minmax6(a, b, c, d, e, f) s(a,d); s(b, e); s(c, f); min3(a, b, c); max3(d, e, f);
 
 #define minmax5(a, b, c, d, e) s(a, b); s(c, d); min3(a, c, e); max3(b, d, e);
 #define minmax6(a, b, c, d, e, f) s(a,d); s(b, e); s(c, f); min3(a, b, c); max3(d, e, f);
 

-__global__ void kernel_median3( short *output, int i_dim, int j_dim)
+__global__ void kernel_medianForget1pix3( short *output,
+                                                                                 int i_dim, int j_dim)

 {  
 {  

-  
-  // coordonnees absolues du point

   int j = __mul24(blockIdx.x,blockDim.x) + threadIdx.x ; 
   int i = __mul24(blockIdx.y,blockDim.y) + threadIdx.y ;
   int j = __mul24(blockIdx.x,blockDim.x) + threadIdx.x ; 
   int i = __mul24(blockIdx.y,blockDim.y) + threadIdx.y ;

-  
-  /**************************************************************************
-   *             tri(s)
-   **************************************************************************/

   int a0, a1, a2, a3, a4, a5 ;
 
   int a0, a1, a2, a3, a4, a5 ;
 

-  /********************************************************************************
-   * les six premieres valeurs (suffisant pour median 3x3 par forgetfull selection)
-   ********************************************************************************/
-  a0 = tex2D(tex_img_ins, j-1, i-1) ;
+  a0 = tex2D(tex_img_ins, j-1, i-1) ; // first 6 values

   a1 = tex2D(tex_img_ins, j, i-1) ;
   a2 = tex2D(tex_img_ins, j+1, i-1) ;
   a3 = tex2D(tex_img_ins, j-1, i) ;
   a4 = tex2D(tex_img_ins, j, i) ;
   a5 = tex2D(tex_img_ins, j+1, i) ;
 
   a1 = tex2D(tex_img_ins, j, i-1) ;
   a2 = tex2D(tex_img_ins, j+1, i-1) ;
   a3 = tex2D(tex_img_ins, j-1, i) ;
   a4 = tex2D(tex_img_ins, j, i) ;
   a5 = tex2D(tex_img_ins, j+1, i) ;
 

+  minmax6(&a0, &a1, &a2, &a3, &a4, &a5);//min->a0 max->a5
+  a5 = tex2D(tex_img_in, j-1, i+1) ;    //next value in a5
+  minmax5(&a1, &a2, &a3, &a4, &a5) ;    //min->a1 max->a5
+  a5 = tex2D(tex_img_ins, j, i+1) ;     //next value in a5
+  minmax4(&a2, &a3, &a4, &a5) ;         //min->a1 max->a5
+  a5 = tex2D(tex_img_ins, j+1, i+1) ;   //next value in a5
+  minmax3(&a3, &a4, &a5) ;              //min->a1 max->a5

   
   

-  //min max aux extremites
-  minmax6(&a0, &a1, &a2, &a3, &a4, &a5) ;
-
-  /********************************************
-   * les deux valeurs suivantes aux extremites 
-   ********************************************/
-  a5 = tex2D(tex_img_in, j-1, i+1) ;
-
-  minmax5(&a1, &a2, &a3, &a4, &a5) ;
-
-  /********************************************
-   * la derniere valeur a la fin
-   ********************************************/
-  
-  a5 = tex2D(tex_img_ins, j, i+1) ;
-
-  minmax4(&a2, &a3, &a4, &a5) ;
-
-  a5 = tex2D(tex_img_ins, j+1, i+1) ;
-  minmax3(&a3, &a4, &a5) ;
-  
-  
-  //median au milieu !
-  output[ __mul24(i, j_dim) +j ] = a4 ;
+  output[ __mul24(i, j_dim) +j ] = a4 ; //middle value

  
 }
  
 }