# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572183 0
# Node ID 1927983f077f50bf561f9a1fc982cd9a65b62bab
# Parent  c89cbdc666989ffb97eb4759fe6126ea6d77c7c0# Parent  04e92f1a7966b099d3c816eaa4b94b1e5569c021
Automatic merge from PDK_3.0.h

diff -r c89cbdc66698 -r 1927983f077f scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/inc/ScreenSaverAnimPlugin.h
--- a/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/inc/ScreenSaverAnimPlugin.h	Mon Mar 08 21:43:27 2010 +0000
+++ b/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/inc/ScreenSaverAnimPlugin.h	Sun Mar 14 13:09:43 2010 +0000
@@ -29,8 +29,8 @@
 #include <coecobs.h>
 #include <npupp.h>
 #include <ecom/implementationinformation.h>    
-#include <CEcomBrowserPluginInterface.h>
-#include <PluginAdapterInterface.h>
+#include <cecombrowserplugininterface.h>
+#include <pluginadapterinterface.h>
 #include <flogger.h>
 
 
diff -r c89cbdc66698 -r 1927983f077f scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/src/ScreenSaverAnimPlugin.cpp
--- a/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/src/ScreenSaverAnimPlugin.cpp	Mon Mar 08 21:43:27 2010 +0000
+++ b/scrsaver/scrsaverplugins/ScreenSaverAnimPlugin/src/ScreenSaverAnimPlugin.cpp	Sun Mar 14 13:09:43 2010 +0000
@@ -31,8 +31,8 @@
 #include <aknnavi.h>
 #include <aknnavide.h>
 #include <npupp.h>
-#include <CEcomBrowserPluginInterface.h>
-#include <BrowserPluginInterface.h>
+#include <cecombrowserplugininterface.h>
+#include <browserplugininterface.h>
 #include <mmf/common/mmfcontrollerpluginresolver.h>
 #include <DRMHelperServerInternalCRKeys.h>
 #include <NPNExtensions.h>
diff -r c89cbdc66698 -r 1927983f077f scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/inc/GifAnimationPlugin.h
--- a/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/inc/GifAnimationPlugin.h	Mon Mar 08 21:43:27 2010 +0000
+++ b/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/inc/GifAnimationPlugin.h	Sun Mar 14 13:09:43 2010 +0000
@@ -28,7 +28,7 @@
 
 #include <npupp.h>
 #include <pluginadapterinterface.h>
-#include <CEcomBrowserPluginInterface.h>
+#include <cecombrowserplugininterface.h>
 #include <MIHLViewerObserver.h>
 
 
diff -r c89cbdc66698 -r 1927983f077f scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/src/GifAnimationPluginControl.cpp
--- a/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/src/GifAnimationPluginControl.cpp	Mon Mar 08 21:43:27 2010 +0000
+++ b/scrsaver/scrsaverplugins/ScreenSaverGifAnimPlugin/src/GifAnimationPluginControl.cpp	Sun Mar 14 13:09:43 2010 +0000
@@ -400,17 +400,17 @@
      	}
 
     // create bitmaps needed for manual scaling    
-    TDisplayMode dMode = CEikonEnv::Static()->DefaultDisplayMode();
+    //TDisplayMode dMode = CEikonEnv::Static()->DefaultDisplayMode();
     if ( iScalingBitmap == NULL )
         {
         iScalingBitmap = new( ELeave ) CFbsBitmap;
-        iScalingBitmap->Create( iTargetSize, dMode ); 
+        iScalingBitmap->Create( iTargetSize, EGray256 ); 
         }
 
     if ( iScalingBitmapMask == NULL )
         {
         iScalingBitmapMask = new( ELeave ) CFbsBitmap;
-        iScalingBitmapMask->Create( iTargetSize, dMode ); 
+        iScalingBitmapMask->Create( iTargetSize, EGray256 ); 
         }
 
     CleanupStack::PopAndDestroy( &fileHandle );