FCL/sf/mw/imghandling: comparison imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailgeneratetask.cpp

equal deleted inserted replaced

-:60bb012f1157
+:9e8b0cc88842
 aProcessor, CThumbnailServer& aServer, RFile64* aFile, TDesC8* aBuffer,
 const TDataType* aMimeType, CThumbnailManager::TThumbnailFlags aFlags,
 const TSize& aSize, TDisplayMode aDisplayMode, TInt aPriority,
 RArray < TThumbnailPersistentSize >* aMissingSizes, const TDesC& aTargetUri,
 TThumbnailSize aThumbnailSize, const TInt64 aModified,
-const CThumbnailManager::TThumbnailQualityPreference aQualityPreference,
+const CThumbnailManager::TThumbnailQualityPreference aQualityPreference ):
-TBool aVirtualUri ):
 CThumbnailTask( aProcessor, aPriority ), iServer( aServer ),
 iFlags( aFlags ), iSize( aSize ), iDisplayMode( aDisplayMode ),
 iMissingSizes( aMissingSizes ), iTargetUri( aTargetUri ),
 iThumbnailSize( aThumbnailSize ), iModified(aModified),
-iQualityPreference( aQualityPreference ), iVirtualUri( aVirtualUri )
+iQualityPreference( aQualityPreference )
 {
 TN_DEBUG2( "CThumbnailGenerateTask(0x%08x)::CThumbnailGenerateTask()", this);
 if ( !aBuffer && aFile)
 {
 if ( iMissingSizes )
 {
 iMissingSizes->Reset();
 delete iMissingSizes;
-iMissingSizes = NULL;
 }
 if ( iBitmapHandle )
 {
 iServer.DeleteBitmapFromPool( iBitmapHandle );
 #ifdef _DEBUG
 aStart.UniversalTime();
 #endif
-TBuf8< KMaxDataTypeLength > mimeType;
+TParsePtrC parse(iFilename);
+TPtrC ext(parse.Ext());
-if ( (!iVirtualUri && iFilename.Right(KExtLength).CompareF(KNonEmbeddedArtExt) == 0) ||
+TBuf8< KMaxDataTypeLength > mimeType;
-(iVirtualUri && iTargetUri.Right(KExtLength).CompareF(KContactExt) == 0) ) // tparse panics with virtual URI
+if  (ext.CompareF(KNonEmbeddedArtExt)== 0)
 {
 mimeType.Copy( KImageMime );
 }
 else
 {
 mimeType = iMimeType.Des8();
 }
 iProvider = iServer.ResolveProviderL(mimeType);
-TN_DEBUG3( "CThumbnailGenerateTask(0x%08x) -- provider UID 0x%08x", this, iProvider->Uid());
+TN_DEBUG3( "CThumbnailGenerateTask(0x%08x) -- provider UID 0x%08x", this,
+iProvider->Uid());
 __ASSERT_DEBUG(( iProvider ), ThumbnailPanic( EThumbnailNullPointer ));
 iProvider->CancelGetThumbnail();
 iProvider->Reset();
 // ---------------------------------------------------------------------------
 //
 void CThumbnailGenerateTask::DoCancel()
 {
 TN_DEBUG2( "CThumbnailGenerateTask(0x%08x)::DoCancel()", this );
 if ( iProvider )
 {
 iProvider->CancelGetThumbnail();
 }
 }
 CleanupStack::Pop( aBitmap );
 // compTask is the scale task which returns the bitmap to the client
 CThumbnailScaleTask* complTask = NULL;
-TInt err1 = KErrNone;
-TInt err2 = KErrNone;
-TBool isPublic = ETrue;
-TBool isPublic2 = ETrue;
-if(iFilename != KNullDesC)
-{
-TRAP(err1, iServer.StoreForPathL(iFilename));
-isPublic = iServer.IsPublicPath( iFilename );
-}
-if(iTargetUri != KNullDesC )
-{
-TRAP(err2, iServer.StoreForPathL(iTargetUri));
-isPublic2 = iServer.IsPublicPath( iTargetUri );
-}
-// check if need to create more than one scale task
 if ( iMissingSizes )
 {
 const TInt count = iMissingSizes->Count();
-// scale small thumbs first, because fullscreen encoding takes longer
+for ( TInt i( 0 ); i < count; i++ )
-for ( TInt i( count-1 ); i >= 0; i-- )
 {
 TThumbnailSize size = (*iMissingSizes)[ i ].iType;
 #ifdef _DEBUG
 TN_DEBUG3( "CThumbnailGenerateTask(0x%08x)::CreateScaleTasksL() *iMissingSizes)[ i ].iType == %d", this, size );
 #endif
 if ( iPortrait )
 {
 if ( size == EFullScreenThumbnailSize ||
 size == EVideoFullScreenThumbnailSize ||
 size == EAudioFullScreenThumbnailSize ||
-size == EImageFullScreenThumbnailSize ||
+size == EImageFullScreenThumbnailSize )
-size == EContactFullScreenThumbnailSize )
 {
 TN_DEBUG2( "*iMissingSizes)[ i ].iWidth == %d", (*iMissingSizes)[ i ].iSize.iWidth );
 TN_DEBUG2( "*iMissingSizes)[ i ].iHeight == %d", (*iMissingSizes)[ i ].iSize.iHeight );
 TInt width = (*iMissingSizes)[ i ].iSize.iWidth;
 (*iMissingSizes)[ i ].iSize.iWidth = (*iMissingSizes)[ i ].iSize.iHeight;
 }
 CThumbnailScaleTask* complTask = CThumbnailScaleTask::NewL( iProcessor, iServer, iFilename,
 aBitmap, iOriginalSize, (*iMissingSizes)[ i ].iSize, (*iMissingSizes)[ i ].iCrop, iDisplayMode,
 KMaxPriority, iTargetUri, (*iMissingSizes)[ i ].iType, iModified, iScaledBitmapToPool, iEXIF,
-iRequestId, iVirtualUri);
+iRequestId);
 CleanupStack::PushL( complTask );
+TInt err1 = KErrNone;
+TInt err2 = KErrNone;
+if(iFilename != KNullDesC)
+{
+TRAP(err1, iServer.StoreForPathL(iFilename));
+}
+if(iTargetUri != KNullDesC )
+{
+TRAP(err2, iServer.StoreForPathL(iTargetUri));
+}
 // if trying to access Z drive, don't try to store
 // don't want to store custom sizes
-// don't store if from private directory
+if( err1 == KErrAccessDenied || err2 == KErrAccessDenied ||
-if( !isPublic || !isPublic2 ||
+(*iMissingSizes)[ i ].iType == ECustomThumbnailSize ||
-err1 == KErrAccessDenied || err2 == KErrAccessDenied ||
+(*iMissingSizes)[ i ].iType == EUnknownThumbnailSize )
-(*iMissingSizes)[ i ].iType == ECustomThumbnailSize ||
-(*iMissingSizes)[ i ].iType == EUnknownThumbnailSize )
 {
 complTask->SetDoStore( EFalse );
 TN_DEBUG2( "CThumbnailGenerateTask(0x%08x)::CreateScaleTasksL() - do not store", this );
 }
 else
 {
-complTask->SetDoStore( ETrue );
+if(iFilename != KNullDesC)
+{
+complTask->SetDoStore(iServer.IsPublicPath( iFilename ));
+}
+if(iTargetUri != KNullDesC)
+{
+complTask->SetDoStore(iServer.IsPublicPath( iTargetUri ));
+}
 }
 iProcessor.AddTaskL( complTask );
 CleanupStack::Pop( complTask );
 if( iPortrait )
 {
 if ( iThumbnailSize == EFullScreenThumbnailSize ||
 iThumbnailSize == EVideoFullScreenThumbnailSize ||
 iThumbnailSize == EAudioFullScreenThumbnailSize ||
-iThumbnailSize == EImageFullScreenThumbnailSize ||
+iThumbnailSize == EImageFullScreenThumbnailSize )
-iThumbnailSize == EContactFullScreenThumbnailSize)
 {
 TInt width = iSize.iWidth;
 iSize.iWidth = iSize.iHeight;
 iSize.iHeight = width;
 }
 }
 complTask = CThumbnailScaleTask::NewL( iProcessor, iServer, iFilename,
 aBitmap, iOriginalSize, iSize, iFlags& CThumbnailManager
 ::ECropToAspectRatio, iDisplayMode, KMaxPriority, iTargetUri,
-iThumbnailSize, iModified, iScaledBitmapToPool, iEXIF, iRequestId,
+iThumbnailSize, iModified, iScaledBitmapToPool, iEXIF, iRequestId );
-iVirtualUri);
 CleanupStack::PushL( complTask );
+TInt err1 = KErrNone;
+TInt err2 = KErrNone;
+if(iFilename != KNullDesC)
+{
+TRAP(err1, iServer.StoreForPathL(iFilename));
+}
+if(iTargetUri != KNullDesC)
+{
+TRAP(err2, iServer.StoreForPathL(iTargetUri));
+}
 // if trying to access Z drive, don't try to store
 // don't want to store custom sizes
-if( !isPublic || !isPublic2 ||
+if( err1 == KErrAccessDenied || err2 == KErrAccessDenied ||
-err1 == KErrAccessDenied || err2 == KErrAccessDenied ||
 iThumbnailSize == ECustomThumbnailSize ||
 iThumbnailSize == EUnknownThumbnailSize )
 {
 complTask->SetDoStore( EFalse );
 TN_DEBUG2( "CThumbnailGenerateTask(0x%08x)::CreateScaleTasksL() - do not store", this );
 }
 else
 {
-complTask->SetDoStore( ETrue );
+if(iFilename != KNullDesC)
+{
+complTask->SetDoStore(iServer.IsPublicPath( iFilename ));
+}
+if(iTargetUri != KNullDesC)
+{
+complTask->SetDoStore(iServer.IsPublicPath( iTargetUri ));
+}
 }
 iProcessor.AddTaskL( complTask );
 CleanupStack::Pop( complTask );
 // of requested size only meaningful.
 if(iFilename != KNullDesC)
 {
 iServer.StoreForPathL( iFilename )->StoreThumbnailL(
-iFilename, tempBitmap, aOriginalSize, EFalse, iThumbnailSize, iModified, !iVirtualUri, ETrue );
+iFilename, tempBitmap, aOriginalSize, EFalse, iThumbnailSize, iModified, EFalse, ETrue );
 		//remove result from fetched checker
-iServer.FetchedChecker().SetFetchResult( iFilename,  iThumbnailSize, KErrNone );
+iServer.FetchedChecker().SetFetchResult( iFilename, KErrNone );
 }
 else if(iTargetUri != KNullDesC)
 {
 iServer.StoreForPathL( iTargetUri )->StoreThumbnailL(
-iTargetUri, tempBitmap, aOriginalSize, EFalse, iThumbnailSize, iModified, !iVirtualUri, ETrue );
+iTargetUri, tempBitmap, aOriginalSize, EFalse, iThumbnailSize, iModified, EFalse, ETrue );
 		//remove result from fetched checker
-iServer.FetchedChecker().SetFetchResult( iTargetUri, iThumbnailSize, KErrNone );
+iServer.FetchedChecker().SetFetchResult( iTargetUri, KErrNone );
 }
 CleanupStack::PopAndDestroy( tempBitmap );
 }

branch	RCL_3
changeset 58	9e8b0cc88842
parent 50	60bb012f1157