Enlightenment CVS committal

Author  : raster
Project : e17
Module  : libs/evas

Dir     : e17/libs/evas/src/lib/engines/common


Modified Files:
        evas_blend_pixel_pixel.c 


Log Message:


fluffybrett!

===================================================================
RCS file: 
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_blend_pixel_pixel.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- evas_blend_pixel_pixel.c    11 Feb 2005 05:33:44 -0000      1.15
+++ evas_blend_pixel_pixel.c    31 Mar 2005 09:10:10 -0000      1.16
@@ -181,28 +181,26 @@
 
    src_align = (int)src & 0x3f; /* 64 byte alignment */
    dst_align = (int)dst & 0x3f; /* 64 byte alignment */
-   if ((src_align != 0) && 
-       (!(src_align & 0x3)) && 
-       (src_align == dst_align))
-     {
-       while ((src_align > 0) && (len > 0))
-         {
-            *dst = *src;
-            dst++;
-            src++;
-            len--;
-            src_align -= sizeof(DATA32);
-         }
-     }
-   else
+
+   if ((src_align != dst_align) || 
+       ((src_align & 0x3) != 0))
      {
 #ifdef BUILD_C
        evas_common_copy_pixels_rgba_to_rgba_c(src, dst, len);
-#endif
        return;
      }
-#endif   
-   
+#endif
+
+   while ((src_align > 0) && (len > 0))
+     {
+       *dst = *src;
+       dst++;
+       src++;
+       len--;
+       src_align -= sizeof(DATA32);
+     }
+#endif /* ALIGN_FIX */
+ 
    src_ptr = src;
    dst_ptr = dst;
    dst_end_ptr = dst + len;
@@ -234,26 +232,24 @@
 
    src_align = (int)src & 0x3f; /* 64 byte alignment */
    dst_align = (int)dst & 0x3f; /* 64 byte alignment */
-   if ((src_align != 0) && 
-       (!(src_align & 0x3)) && 
-       (src_align == dst_align))
-     {
-       while ((src_align > 0) && (len > 0))
-         {
-            *dst = *src;
-            dst++;
-            src++;
-            len--;
-            src_align -= sizeof(DATA32);
-         }
-     }
-   else
+
+   if ((src_align != dst_align) || 
+       ((src_align & 0x3) != 0))
      {
 #ifdef BUILD_C
        evas_common_copy_pixels_rgba_to_rgba_c(src, dst, len);
 #endif
        return;
      }
+   
+   while ((src_align > 0) && (len > 0))
+     {
+       *dst = *src;
+       dst++;
+       src++;
+       len--;
+       src_align -= sizeof(DATA32);
+     }
 #endif
    
    src_ptr = src;
@@ -287,27 +283,25 @@
 
    src_align = (int)src & 0x3f; /* 64 byte alignment */
    dst_align = (int)dst & 0x3f; /* 64 byte alignment */
-   if ((src_align != 0) && 
-       (!(src_align & 0x3)) && 
-       (src_align == dst_align))
-     {
-       while ((src_align > 0) && (len > 0))
-         {
-            *dst = *src;
-            dst++;
-            src++;
-            len--;
-            src_align -= sizeof(DATA32);
-         }
-     }
-   else
+
+   if ((src_align != dst_align) || 
+       ((src_align & 0x3) != 0))
      {
 #ifdef BUILD_C
        evas_common_copy_pixels_rgba_to_rgba_c(src, dst, len);
 #endif
        return;
      }
-#endif
+
+   while ((src_align > 0) && (len > 0))
+     {
+       *dst = *src;
+       dst++;
+       src++;
+       len--;
+       src_align -= sizeof(DATA32);
+     }
+#endif /* ALIGN_FIX */
    
    src_ptr = src;
    dst_ptr = dst;




-------------------------------------------------------
This SF.net email is sponsored by Demarc:
A global provider of Threat Management Solutions.
Download our HomeAdmin security software for free today!
http://www.demarc.com/info/Sentarus/hamr30
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to