last version

[book_gpu.git] / BookGPU / Chapters / chapter3 / code / kernMedianSeparable.cu

diff --git a/BookGPU/Chapters/chapter3/code/kernMedianSeparable.cu b/BookGPU/Chapters/chapter3/code/kernMedianSeparable.cu
index f4ad2c6ad3d9534c5be6ed193f70656714e5f384..bdf7023572747a9dc9d92f4a1470e5550663f69e 100755 (executable)
--- a/BookGPU/Chapters/chapter3/code/kernMedianSeparable.cu
+++ b/BookGPU/Chapters/chapter3/code/kernMedianSeparable.cu
@@ -1,7 +1,7 @@
 __global__ void kernel_medianV_sh( short *output, int i_dim, int j_dim, int r)
 {
   
 __global__ void kernel_medianV_sh( short *output, int i_dim, int j_dim, int r)
 {
   

-  int idc, val, min, max, inf, egal, sup, mxinf, minsup, estim ;
+  int idc, val, min, max, inf, equal, sup, mxinf, minsup, estim ;

 
   //coordinates in the block
   int ib = threadIdx.y ;
 
   //coordinates in the block
   int ib = threadIdx.y ;


@@ -40,7 +40,7 @@ __global__ void kernel_medianV_sh( short *output, int i_dim, int j_dim, int r)
   while (1)
        {  
          estim = (min+max)/2 ;
   while (1)
        {  
          estim = (min+max)/2 ;

-         inf = sup = egal = 0  ;
+         inf = sup = equal = 0  ;

          mxinf = min ;
          minsup= max ;
          for (idc =0; idc< 2*r+1 ; idc++)
          mxinf = min ;
          minsup= max ;
          for (idc =0; idc< 2*r+1 ; idc++)


@@ -54,7 +54,7 @@ __global__ void kernel_medianV_sh( short *output, int i_dim, int j_dim, int r)
                        {
                          sup++;
                          if( val < minsup) minsup = val ;
                        {
                          sup++;
                          if( val < minsup) minsup = val ;

-                       } else egal++ ;
+                       } else equal++ ;

                }
          if ( (inf <= (r+1))&&(sup <=(r+1)) ) break ;
          else if (inf>sup) max = mxinf ;
                }
          if ( (inf <= (r+1))&&(sup <=(r+1)) ) break ;
          else if (inf>sup) max = mxinf ;


@@ -62,7 +62,7 @@ __global__ void kernel_medianV_sh( short *output, int i_dim, int j_dim, int r)
          }
   
   if ( inf >= r+1 ) val = mxinf ;
          }
   
   if ( inf >= r+1 ) val = mxinf ;

-  else if (inf+egal >= r+1) val = estim ;
+  else if (inf+equal >= r+1) val = estim ;

   else val = minsup ;
   
   output[ __mul24(j, i_dim)  +i  ] =  val ; 
   else val = minsup ;
   
   output[ __mul24(j, i_dim)  +i  ] =  val ;