# HG changeset patch
# User Matt Plumtree <matt.plumtree@nokia.com>
# Date 1281110720 -3600
# Node ID 3db46cb3f779ef85b0d1386863ad74b1aeb2e1ee
# Parent  f5b6a43d0d2dd362b8427730bb339875b1b0c6f1
Fix TRANSPARENCY_NONE composition for surfaces narrower than the context.
Improve performance of point sample scaling with 8-bit samples, by using fixed point code
Allow any non-zero value for the boolean attribute WFC_ELEMENT_SOURCE_FLIP
Simplify RemoveElement code

diff -r f5b6a43d0d2d -r 3db46cb3f779 graphicscomposition/openwfcompositionengine/common/src/owfimage.c
--- a/graphicscomposition/openwfcompositionengine/common/src/owfimage.c	Thu Aug 05 12:20:08 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/common/src/owfimage.c	Fri Aug 06 17:05:20 2010 +0100
@@ -509,7 +509,6 @@
     OWFint                  countY;
     OWFuint32*              dstPtr;
     OWFpixel*               srcPtr;
-    OWFuint8*               destination;
 #ifndef OWF_IMAGE_INTERNAL_PIXEL_IS_FLOAT
     OWFint                  widthBytes;
 #endif
@@ -542,15 +541,15 @@
         OWF_Image_UnpremultiplyAlpha(src);
     }
 
-    destination = (OWFuint8*) dst->data;
 #ifndef OWF_IMAGE_INTERNAL_PIXEL_IS_FLOAT
     widthBytes = OWF_Image_GetStride(src->width, &src->format, 0);
 #endif
 
     for (countY = 0; countY < src->height; countY++)
     {   
+        OWFuint8* destination = (OWFuint8*) dst->data;
+        destination += countY*dst->stride;
         dstPtr = (OWFuint32*) destination;    
-        destination += dst->stride;
 
         switch (dst->format.pixelFormat)
         {
@@ -983,7 +982,6 @@
                                    OWFfloat* srcRect)
 {
     OWFint                  ox = 0, oy = 0;
-    OWFfloat                dx = 0.f, dy = 0.f; 
     OWFint                  x, y;
 
     /* images must be valid */
@@ -1009,6 +1007,10 @@
         return OWF_FALSE;
     }
 
+#ifdef OWF_IMAGE_INTERNAL_PIXEL_IS_FLOAT
+    {
+        OWFfloat                dx = 0.f, dy = 0.f; 
+    
     /* solve scaling ratios for image */
     dx = (OWFfloat) srcRect[2] / (OWFfloat) dstRect->width;
     dy = (OWFfloat) srcRect[3] / (OWFfloat) dstRect->height;
@@ -1036,8 +1038,63 @@
                                dstRect->y + y,
                                pixel);
             
+            }
         }
     }
+#else
+    if (srcRect[0] < 0 || (srcRect[0] + srcRect[2]) > src->width ||
+            srcRect[1] < 0 || (srcRect[1] + srcRect[3]) > src->height)
+        {
+        /* Source rectangle out of bounds */
+        return OWF_FALSE;
+        }
+
+    if (dstRect->x < 0 || (dstRect->x + dstRect->width) > dst->width ||
+            dstRect->y < 0 || (dstRect->y + dstRect->height) > dst->height)
+        {
+        /* Destination rectangle out of bounds */
+        return OWF_FALSE;
+        }
+
+    {
+        OWFint dxFix, dyFix;
+        OWFint xFixStart, yFix;
+        OWFuint32 *dstPtr, *srcLinePtr;
+    
+/* Integer <-> 16.16 fixed point conversion macros */
+#define INT_TO_FIXED_PT(X) ((X) << 16)
+#define FIXED_PT_TO_INT(X) ((X) >> 16)
+    
+        /* Calculate scaling factors in fixed point (with rounding). */
+        dxFix = (OWFint)((srcRect[2] * INT_TO_FIXED_PT(1) + (dstRect->width >> 1)) / dstRect->width);
+        dyFix = (OWFint)((srcRect[3] * INT_TO_FIXED_PT(1) + (dstRect->height >> 1)) / dstRect->height);
+    
+        /* Calculate fixed point location in source, with half-pixel offset */
+        xFixStart = (OWFint)(srcRect[0] * INT_TO_FIXED_PT(1) + (dxFix >> 1));
+        yFix = (OWFint)(srcRect[1] * INT_TO_FIXED_PT(1) + (dyFix >> 1));
+    
+        /* Initial target address. */
+        dstPtr = (OWFuint32*)dst->data + dstRect->y * dst->width + dstRect->x;
+    
+        for (y = 0; y < dstRect->height; y++)
+        {
+            OWFint xFix = xFixStart;
+    
+            oy = FIXED_PT_TO_INT(yFix);
+            srcLinePtr = (OWFuint32*)src->data + oy * src->width;
+    
+            for (x = 0; x < dstRect->width; x++) 
+            {
+                ox = FIXED_PT_TO_INT(xFix);
+                dstPtr[x] = srcLinePtr[ox];
+                xFix += dxFix;
+            }
+    
+            dstPtr += dst->width;
+            yFix += dyFix;
+        }
+    }
+#endif
     return OWF_TRUE;
 }
 
@@ -1649,20 +1706,20 @@
     {
         case OWF_TRANSPARENCY_NONE:
         {
-#ifdef SLOW_CODE
             /*
             rgb     = src.rgb
             alpha    = 1
             */
             BLENDER_INNER_LOOP_BEGIN;
+#ifdef OWF_IMAGE_INTERNAL_PIXEL_IS_FLOAT
                 DR = SR;
                 DG = SG;
                 DB = SB;
                 DA = OWF_FULLY_OPAQUE;
+#else
+                *(OWFuint32*)dstPtr = *(OWFuint32*)srcPtr | ARGB8888_ALPHA_MASK;
+#endif
             BLENDER_INNER_LOOP_END_NO_MASK;
-#else
-            memcpy(dstPtr, srcPtr, drect.height*drect.width*4);
-#endif
             break;
         }
 
diff -r f5b6a43d0d2d -r 3db46cb3f779 graphicscomposition/openwfcompositionengine/composition/src/wfccontext.c
--- a/graphicscomposition/openwfcompositionengine/composition/src/wfccontext.c	Thu Aug 05 12:20:08 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/composition/src/wfccontext.c	Fri Aug 06 17:05:20 2010 +0100
@@ -1205,7 +1205,6 @@
 WFC_Context_RemoveElement(WFC_CONTEXT* context,
                           WFCElement element)
 {
-    WFCErrorCode            err = WFC_ERROR_BAD_HANDLE;
     WFC_ELEMENT*            elemento = NULL;
 
     OWF_ASSERT(context);
@@ -1220,11 +1219,9 @@
          */
         elemento->shared = WFC_FALSE;
         context->lowestElement = WFC_Scene_LowestElement(context->workScene);
-
-        err = WFC_ERROR_NONE;
     }
 
-    return err;
+    return WFC_ERROR_NONE;
 }
 
 /*!
diff -r f5b6a43d0d2d -r 3db46cb3f779 graphicscomposition/openwfcompositionengine/composition/src/wfcelement.c
--- a/graphicscomposition/openwfcompositionengine/composition/src/wfcelement.c	Thu Aug 05 12:20:08 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/composition/src/wfcelement.c	Fri Aug 06 17:05:20 2010 +0100
@@ -390,10 +390,7 @@
 
         case WFC_ELEMENT_SOURCE_FLIP:
         {
-            WFCboolean  flip = (WFCboolean) value;
-
-            result = BOOLEAN_TO_ERROR((WFC_TRUE == flip ||
-                                       WFC_FALSE == flip));
+            result = WFC_ERROR_NONE;
             break;
         }