diff -r 5f8e5adbbed9 -r 29cda98b007e engine/src/ImageHandler.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/engine/src/ImageHandler.cpp	Thu Feb 25 14:29:19 2010 +0000
@@ -0,0 +1,223 @@
+/*
+* Copyright (c) 2007-2010 Sebastian Brannstrom, Lars Persson, EmbedDev AB
+*
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* EmbedDev AB - initial contribution.
+*
+* Contributors:
+* Example code from OcrExample Copyright (c) 2006 Nokia Corporation.
+* Description:
+*
+*/
+
+#include "ImageHandler.h"
+
+// =============================================================================
+// CImageHandler, a utility class for loading images.
+// =============================================================================
+
+// ============================= MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// CImageHandler::CImageHandler
+// C++ constructor can NOT contain any code, that
+// might leave.
+// -----------------------------------------------------------------------------
+//
+CImageHandler::CImageHandler( RFs& aFs )
+    : CActive(CActive::EPriorityStandard)
+    , iDecoder(NULL)
+    , iScaler(NULL)
+    , iFs(aFs)
+    , iSize(0,0)
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// CImageHandler::ConstructL
+// Symbian 2nd phase constructor can leave.
+// -----------------------------------------------------------------------------
+//
+void CImageHandler::ConstructL()
+    {
+    CActiveScheduler::Add(this);
+    iBitmap = new (ELeave) CFbsBitmap;
+    }
+
+// -----------------------------------------------------------------------------
+// CImageHandler::NewLC
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CImageHandler* CImageHandler::NewL(RFs& aFs)
+    {
+    CImageHandler* self = NewLC(aFs);
+    CleanupStack::Pop();
+    return self;
+    }
+
+// -----------------------------------------------------------------------------
+// CImageHandler::NewLC
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+EXPORT_C CImageHandler* CImageHandler::NewLC(RFs& aFs)
+    {
+    CImageHandler* self = new (ELeave) CImageHandler(aFs);
+    CleanupStack::PushL( self );
+    self->ConstructL();
+
+    return self;
+    }
+
+// Destructor
+EXPORT_C CImageHandler::~CImageHandler()
+    {
+	// Cancel any outstanding request
+	Cancel();
+	Deque();
+    delete iDecoder;
+    delete iScaler;
+	delete iBitmap;
+    iCallbackQue.Close(); 
+    }
+
+// -----------------------------------------------------------------------------
+// CImageHandler::LoadFileL
+// Loads a selected frame from a named file
+// -----------------------------------------------------------------------------
+//
+void CImageHandler::LoadFileL(const TFileName& aFileName, TInt aSelectedFrame)
+    {
+    __ASSERT_ALWAYS(!IsActive(),User::Invariant());
+    if ( iDecoder )
+        {
+        delete iDecoder;
+        iDecoder = NULL;
+        }
+   
+    iDecoder = CImageDecoder::FileNewL(iFs, aFileName);
+    // Get image information
+    iFrameInfo = iDecoder->FrameInfo(aSelectedFrame);
+    // Resize to fit.
+    TRect bitmap = iFrameInfo.iFrameCoordsInPixels;
+
+    // release possible previous image
+    iBitmap->Reset();
+    iBitmap->Create(bitmap.Size(), EColor16M);
+
+    // Decode as bitmap.
+    iDecoder->Convert(&iStatus, *iBitmap, aSelectedFrame);
+    SetActive();
+    }
+
+EXPORT_C void CImageHandler::LoadFileAndScaleL(CFbsBitmap* aScaledBitmap, 
+								      const TFileName& aFileName,
+                                      const TSize &aSize,
+                                      MImageHandlerCallback& aCallback,
+                                      TInt aSelectedFrame)
+    {        
+    if(!IsActive())
+    	{
+    	__ASSERT_ALWAYS(!IsActive(),User::Invariant());
+    	iSize = aSize;
+    	iScaledBitmap = aScaledBitmap;
+    	iScaledBitmap->Reset();
+    	iScaledBitmap->Create(aSize, EColor16M);
+    	iCallback = &aCallback; 
+    	LoadFileL(aFileName, aSelectedFrame);
+    	}
+    else
+    	{
+    	TImageStruct imageStruct;
+    	imageStruct.iCallBack = &aCallback;
+    	imageStruct.iScaledImage = aScaledBitmap;
+    	imageStruct.iScaledSize = aSize;    
+    	imageStruct.iFileName = aFileName;
+    	iCallbackQue.Append(imageStruct);
+    	}
+    }
+
+EXPORT_C CFbsBitmap* CImageHandler::ScaledBitmap()
+	{
+	return iScaledBitmap;
+	}
+
+void CImageHandler::ScaleL()
+    {
+    __ASSERT_ALWAYS(!IsActive(),User::Invariant());
+    if ( iScaler )
+        {
+        delete iScaler;
+        }
+    iScaler = NULL;
+    iScaler = CBitmapScaler::NewL();
+    iScaler->Scale(&iStatus, *iBitmap, *iScaledBitmap, ETrue);
+    SetActive();
+    }
+
+// -----------------------------------------------------------------------------
+// CImageHandler::FrameInfo
+// Get the current frame information.
+// -----------------------------------------------------------------------------
+//
+const TFrameInfo& CImageHandler::FrameInfo() const
+    {
+    return iFrameInfo;
+    }
+
+// -----------------------------------------------------------------------------
+// CImageHandler::RunL
+// CActive::RunL() implementation. Called on image load success/failure.
+// -----------------------------------------------------------------------------
+//
+void CImageHandler::RunL()
+    {
+    if ((! iStatus.Int()) && (iSize.iWidth != 0) && (iSize.iHeight != 0))
+        {
+        ScaleL();
+        iSize.SetSize(0,0);
+        }
+    else
+        {
+        // Invoke callback.
+        iCallback->ImageOperationCompleteL(iStatus.Int());        
+        if(iCallbackQue.Count())
+        	{
+        	TInt loaderror = KErrNotFound;
+        	while(loaderror != KErrNone && iCallbackQue.Count())
+        		{
+        		TImageStruct imageStruct= iCallbackQue[0];
+        		iCallbackQue.Remove(0);
+        		TRAP(loaderror, LoadFileAndScaleL(imageStruct.iScaledImage, imageStruct.iFileName, imageStruct.iScaledSize, *imageStruct.iCallBack));
+        		}
+        	}
+        }
+ 
+    }
+
+// -----------------------------------------------------------------------------
+// CImageHandler::DoCancel
+// CActive::Cancel() implementation. Stops decoding.
+// -----------------------------------------------------------------------------
+//
+void CImageHandler::DoCancel()
+    {
+    if ( iDecoder )
+        {
+        iDecoder->Cancel();
+        }
+    if ( iScaler )
+        {
+        iScaler->Cancel();
+        }
+    }
+
+
+