0001-Fix-bounds-for-transparent-borders.patch

Fix bounds for transparent borders - Peter Collingbourne, 2010-09-23 11:45 pm

Download (1.5 kB)

 
b/modules/imgproc/src/imgwarp.cpp
2175 2175 
            else
2176 2176 
            {
2177 2177 
                int x[4], y[4];
2178 
                if( borderType == BORDER_TRANSPARENT &&
2179 
                    ((unsigned)(sx+1) >= (unsigned)ssize.width ||
2180 
                    (unsigned)(sy+1) >= (unsigned)ssize.height) )
2178 
                if( borderType == BORDER_TRANSPARENT )
2181 2179 
                    continue;
2182 2180 

  		





  2183
  2181
  
    
                if( borderType == BORDER_CONSTANT &&

  		





  ......




  2277
  2275
  
    
            else

  		





  2278
  2276
  
    
            {

  		





  2279
  2277
  
    
                int x[8], y[8];

  		





  2280
  
  
    
                if( borderType == BORDER_TRANSPARENT &&

  		





  2281
  
  
    
                    ((unsigned)(sx+3) >= (unsigned)ssize.width ||

  		





  2282
  
  
    
                    (unsigned)(sy+3) >= (unsigned)ssize.height) )

  		





  
  2278
  
    
                if( borderType == BORDER_TRANSPARENT )

  		





  2283
  2279
  
    
                    continue;

  		





  2284
  2280
  
    

  		





  2285
  2281
  
    
                if( borderType == BORDER_CONSTANT &&

  		





  2286
  
  
    
-