Fix ptrdiff_t abuse. Especially in video_filter_invert:

ptrdiff_t is signed so unequality comparison between pointers would
compute wrong when the two operands are within opposite halves of the
memory space.

diff --git a/modules/misc/memcpy/fastmemcpy.h b/modules/misc/memcpy/fastmemcpy.h
index efca0490deacaff448ce53e2f9339785736ad50f..4465a9510cfd1b08f771dc486322df75d60f5c4e 100644 (file)
--- a/modules/misc/memcpy/fastmemcpy.h
+++ b/modules/misc/memcpy/fastmemcpy.h
@@ -246,7 +246,7 @@ void * fast_memcpy(void * to, const void * from, size_t len)
        }
 #else
        /* Align destination at BLOCK_SIZE boundary */
-       for(; ((ptrdiff_t)to & (BLOCK_SIZE-1)) && i>0; i--)
+       for(; ((uintptr_t)to & (BLOCK_SIZE-1)) && i>0; i--)
        {
                __asm__ __volatile__ (
 #ifndef HAVE_MMX1
@@ -273,7 +273,7 @@ void * fast_memcpy(void * to, const void * from, size_t len)
                to = (void *) (((unsigned char *)to)+64);
        }
 
-/*     printf(" %p %p\n", (ptrdiff_t)from&1023, (ptrdiff_t)to&1023); */
+/*     printf(" %p %p\n", (uintptr_t)from&1023, (uintptr_t)to&1023); */
        /* Pure Assembly cuz gcc is a bit unpredictable ;) */
 # if 0
        if(i>=BLOCK_SIZE/64)

diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c
index 23f9ad9b3ddccfd184c442e36f0e19382f273c45..d409ce7ffaf7fe5417d17349fc8c43d415a7d843 100644 (file)
--- a/modules/video_filter/deinterlace.c
+++ b/modules/video_filter/deinterlace.c
@@ -1009,7 +1009,7 @@ static void MergeSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2,
     const uint8_t *p_s1 = (const uint8_t *)_p_s1;
     const uint8_t *p_s2 = (const uint8_t *)_p_s2;
     uint8_t* p_end;
-    while( (ptrdiff_t)p_s1 % 16 )
+    while( (uintptr_t)p_s1 % 16 )
     {
         *p_dest++ = ( (uint16_t)(*p_s1++) + (uint16_t)(*p_s2++) ) >> 1;
     }        

diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c
index b0c246f3b2ff4a538628b87d78ae04fa99089dc5..c11e1ad4f441c1e29ac099b4d9418d5d8ef57f14 100644 (file)
--- a/modules/video_filter/invert.c
+++ b/modules/video_filter/invert.c
@@ -151,7 +151,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
             p_in64 = (uint64_t*)p_in;
             p_out64 = (uint64_t*)p_out;
 
-            for( ; (ptrdiff_t)p_in64 < (ptrdiff_t)p_line_end ; )
+            while( p_in64 < p_line_end )
             {
                 /* Do 64 pixels at a time */
                 *p_out64++ = ~*p_in64++; *p_out64++ = ~*p_in64++;