--- a/graphicscomposition/openwfcompositionengine/composition/src/wfcdevice.c	Tue Aug 31 16:31:06 2010 +0300
+++ b/graphicscomposition/openwfcompositionengine/composition/src/wfcdevice.c	Wed Sep 01 12:39:21 2010 +0100
@@ -1,5 +1,4 @@
-/* Copyright (c) 2009-2010 The Khronos Group Inc.
- * Portions copyright (c) 2009-2010  Nokia Corporation and/or its subsidiary(-ies)
+/* Copyright (c) 2009 The Khronos Group Inc.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and/or associated documentation files (the
@@ -825,7 +824,6 @@
         WFC_IMAGE_PROVIDER* object;
 
         object = (WFC_IMAGE_PROVIDER*)OWF_Array_GetItemAt(&device->providers, i);
-		OWF_ASSERT(object);
         if (object->handle == handle)
         {
         
@@ -1138,38 +1136,6 @@
     }
 }
 
-OWF_API_CALL WFCboolean
-WFC_Device_FindScreenNumber(WFCint screenNumber)
-{
-    WFCint i, j, deviceArrayLength, contextArrayLength;
-    WFC_DEVICE* pDevice = NULL;
-    ENTER(WFC_Device_DestroyContext);
-
-    DPRINT(("WFC_Device_CheckScreenNumber(screenNumber = %d)", screenNumber));
-
-    deviceArrayLength = gPhyDevice.iDeviceInstanceArray.length;
-    for (i = 0; i < deviceArrayLength; ++i)
-    {
-        pDevice = DEVICE(OWF_Array_GetItemAt(&(gPhyDevice.iDeviceInstanceArray), i));
-        OWF_ASSERT(pDevice);
-        if (pDevice)
-        {
-            contextArrayLength = pDevice->contexts.length;
-            for (j = 0; j < contextArrayLength; j++)
-            {
-                WFC_CONTEXT*    pContext;
-                pContext = CONTEXT(OWF_Array_GetItemAt(&pDevice->contexts, j));
-                OWF_ASSERT(pContext);
-                if (pContext && (pContext->screenNumber == screenNumber))
-                {
-                    return WFC_TRUE;
-                }
-            }
-        }
-    }
-    return WFC_FALSE;
-}
-
 #ifdef __cplusplus
 }
 #endif