diff -r 792dfc98fb3b -r 8c55c525d5d7 camerauis/cameraapp/generic/inc/cameracontroller/camimagedecoder.h --- a/camerauis/cameraapp/generic/inc/cameracontroller/camimagedecoder.h Fri Mar 12 15:41:04 2010 +0200 +++ b/camerauis/cameraapp/generic/inc/cameracontroller/camimagedecoder.h Mon Mar 15 12:39:00 2010 +0200 @@ -48,7 +48,7 @@ * KErrNone if all went as planned. * @param aBitmap Decoded bitmap. NULL if errors in decoding. */ - virtual void ImageDecoded( TInt aStatus, const CFbsBitmap* aBitmap ) = 0; + virtual void ImageDecoded( TInt aStatus, const CFbsBitmap* aBitmap, const CFbsBitmap* aMask ) = 0; }; @@ -100,6 +100,8 @@ public: void StartConversionL( CCamBufferShare* aBuffer ); + + void StartIconConversionL( TDesC* aFilePath ); private: @@ -158,6 +160,7 @@ HBufC8* iThumbnailData; CFbsBitmap* iDecodedBitmap; + CFbsBitmap* iDecodedMask; CImageDecoder* iDecoder; TInt iRetryCounter;