0001-Fixed-some-illegal-implicitly-type-conversions-betwe.patch

Zhigang Gong, 2013-12-03 04:41 am

Download (1.5 kB)

 
b/modules/ocl/src/opencl/imgproc_threshold.cl
74 74 
        VT vthresh = (VT)(thresh);
75 75 

  		





  76
  76
  
    
#ifdef THRESH_BINARY


  		





  77
  
  
    
        VT vecValue = sdata > vthresh ? max_val : (VT)(0);


  		





  
  77
  
    
        VT vecValue = sdata > vthresh ? (VT)max_val : (VT)(0);


  		





  78
  78
  
    
#elif defined THRESH_BINARY_INV


  		





  79
  
  
    
        VT vecValue = sdata > vthresh ? (VT)(0) : max_val;


  		





  
  79
  
    
        VT vecValue = sdata > vthresh ? (VT)(0) : (VT)max_val;


  		





  80
  80
  
    
#elif defined THRESH_TRUNC


  		





  81
  
  
    
        VT vecValue = sdata > vthresh ? thresh : sdata;


  		





  
  81
  
    
        VT vecValue = sdata > vthresh ? (VT)thresh : sdata;


  		





  82
  82
  
    
#elif defined THRESH_TOZERO


  		





  83
  83
  
    
        VT vecValue = sdata > vthresh ? sdata : (VT)(0);


  		





  84
  84
  
    
#elif defined THRESH_TOZERO_INV


  		





  85
  
  
    
-