# HG changeset patch
# User Gareth Long <garethl@symbian.org>
# Date 1277987194 -3600
# Node ID 2ae553ab1febecccc1cac8a6509b810623ea272c
# Parent  de3e07519bb74ef75eba64c10ec4585f7dbb33a7
Target graphics memory allocation fix for egl, target EPOCHEAP fix for wserv_nga and Zoom2 rotate fix.

diff -r de3e07519bb7 -r 2ae553ab1feb graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfscreen_displaychannel.cpp
--- a/graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfscreen_displaychannel.cpp	Fri May 28 16:02:15 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/adaptation/src/Platform/Graphics/symbian/owfscreen_displaychannel.cpp	Thu Jul 01 13:26:34 2010 +0100
@@ -115,11 +115,11 @@
 void COWFScreenDisplayInfo::ConstructL()
     {
     User::LeaveIfError(iDispChan.Open(iScreenNumber));
-#if defined (__WINS__) || defined (__SYBORG__)
+//#if defined (__WINS__) || defined (__SYBORG__)
     iDefaultRotation = RDisplayChannel::ERotationNormal;
-#else
-    iDefaultRotation = RDisplayChannel::ERotation270CW;
-#endif
+//#else
+//    iDefaultRotation = RDisplayChannel::ERotation270CW;
+//#endif
     
     switch (iDispChan.CurrentRotation())
         {
diff -r de3e07519bb7 -r 2ae553ab1feb openvg/openvgrefimplementation/sfopenvg/sfopenvg/riMiniEGL.cpp
--- a/openvg/openvgrefimplementation/sfopenvg/sfopenvg/riMiniEGL.cpp	Fri May 28 16:02:15 2010 +0100
+++ b/openvg/openvgrefimplementation/sfopenvg/sfopenvg/riMiniEGL.cpp	Thu Jul 01 13:26:34 2010 +0100
@@ -1650,6 +1650,8 @@
 	VGImageFormat format;
 	int* data = NULL;
 	EGLBoolean err = OSGetNativePixmapInfo(pixmap, &width, &height, &stride,&format, &data);
+	width = 640;
+	height = 480; // enforce the largest current target hardware display size
 	
     Drawable* d = NULL;
 	RIEGLSurface* s = NULL;
diff -r de3e07519bb7 -r 2ae553ab1feb openvg/openvgrefimplementation/sfopenvg/vgi/vgi.cpp
--- a/openvg/openvgrefimplementation/sfopenvg/vgi/vgi.cpp	Fri May 28 16:02:15 2010 +0100
+++ b/openvg/openvgrefimplementation/sfopenvg/vgi/vgi.cpp	Thu Jul 01 13:26:34 2010 +0100
@@ -19,8 +19,8 @@
 #include <vg\vgcontext_symbian.h>
 #include <egl.h>
 
-#define MAX_WIDTH 		320*4 // in bytes
-#define MAX_HEIGHT 		320*4 // in bytes
+#define MAX_WIDTH 		640*4 // in bytes
+#define MAX_HEIGHT 		480*4 // in bytes
 class TEgl
 	{
 public:
diff -r de3e07519bb7 -r 2ae553ab1feb windowing/windowserver/group/openwfc/WServ_nga.MMP
--- a/windowing/windowserver/group/openwfc/WServ_nga.MMP	Fri May 28 16:02:15 2010 +0100
+++ b/windowing/windowserver/group/openwfc/WServ_nga.MMP	Thu Jul 01 13:26:34 2010 +0100
@@ -25,9 +25,9 @@
 EPOCSTACKSIZE	  0x4000
 // 6Mb max heap for Winscw builds (default 1Mb used for target builds)
 
-#ifdef WINS
+//#ifdef WINS
 EPOCHEAPSIZE	    0x00010000 0x00600000
-#endif
+//#endif
 EPOCFIXEDPROCESS
 CAPABILITY        PowerMgmt ReadDeviceData WriteDeviceData ProtServ