Binary file imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/ThumbnailManager_0x102830AB_v10.10.8_SA_S60.50_Euro1.sis has changed
--- a/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/package.pkg Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/package.pkg Fri Sep 03 10:29:37 2010 +0300
@@ -17,7 +17,7 @@
&EN
; Header
-#{"Thumbnail Manager"},(0x102830AB), 10, 10, 8, TYPE=SA, RU
+#{"Thumbnail Manager"},(0x102830AB), 10, 10, 9, TYPE=SA, RU
; Localised Vendor name
%{"Nokia"}
--- a/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/stub.pkg Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/stub.pkg Fri Sep 03 10:29:37 2010 +0300
@@ -17,7 +17,7 @@
&EN
; Header
-#{"ThumbnailManager"},(0x102830AB), 10, 10, 8, TYPE=SA
+#{"ThumbnailManager"},(0x102830AB), 10, 10, 9, TYPE=SA
; Localised Vendor name
%{"Nokia"}
Binary file imagehandlingutilities/thumbnailmanager/sis/thumbnailmanager/thumbnailmanager_stub.sis has changed
--- a/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanagercenrep/package.pkg Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/sis/thumbnailmanagercenrep/package.pkg Fri Sep 03 10:29:37 2010 +0300
@@ -17,7 +17,7 @@
&EN
; Header
-#{"Thumbnail Manager Cenrep"},(0x10202BE9), 10, 10, 8, TYPE=SP
+#{"Thumbnail Manager Cenrep"},(0x10202BE9), 10, 10, 9, TYPE=SP
; Localised Vendor name
%{"Symbian Software Ltd."}
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagaudioobserver.cpp Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagaudioobserver.cpp Fri Sep 03 10:29:37 2010 +0300
@@ -337,12 +337,10 @@
// set observing conditions
CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
- CMdEObjectCondition& addObjectCondition = addCondition->AddObjectConditionL( audioDef );
- CleanupStack::PushL( &addObjectCondition );
+ addCondition->AddObjectConditionL( audioDef );
CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
- CMdEObjectCondition& modifyObjectCondition = modifyCondition->AddObjectConditionL( audioDef );
- CleanupStack::PushL( &modifyObjectCondition );
+ modifyCondition->AddObjectConditionL( audioDef );
// add observer
iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd );
@@ -350,7 +348,7 @@
// modify observer
iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify );
- CleanupStack::Pop( 4, addCondition );
+ CleanupStack::Pop( 2, addCondition );
TN_DEBUG1( "CThumbAGAudioObserver::AddObserversL() - end" );
OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGAUDIOOBSERVER_ADDOBSERVERSL, "CThumbAGAudioObserver::AddObserversL - end" );
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagcameraobserver.cpp Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagcameraobserver.cpp Fri Sep 03 10:29:37 2010 +0300
@@ -333,12 +333,10 @@
// set observing conditions
CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
- CMdEPropertyCondition& addPropertyCondition = addCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera));
- CleanupStack::PushL( &addPropertyCondition );
+ addCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera));
CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
- CMdEPropertyCondition& modifyPropertyCondition = modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera));
- CleanupStack::PushL( &modifyPropertyCondition );
+ modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintEqual(MdeConstants::Object::ECamera));
// add observer
iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd );
@@ -346,7 +344,7 @@
// modify observer
iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify );
- CleanupStack::Pop( 4, addCondition );
+ CleanupStack::Pop( 2, addCondition );
TN_DEBUG1( "CThumbAGCameraObserver::AddObserversL() - end" );
OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGCAMERAOBSERVER_ADDOBSERVERSL, "CThumbAGCameraObserver::AddObserversL - end" );
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagimageobserver.cpp Fri Sep 03 10:29:37 2010 +0300
@@ -317,19 +317,14 @@
// set observing conditions
CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
-
- CMdEObjectCondition& addObjectCondition = addCondition->AddObjectConditionL( imageDef );
- CleanupStack::PushL( &addObjectCondition );
+ addCondition->AddObjectConditionL( imageDef );
- CMdEPropertyCondition& addPropertyCondition = addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
- CleanupStack::PushL( &addPropertyCondition );
+ addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
- CMdEObjectCondition& modifyObjectCondition = modifyCondition->AddObjectConditionL( imageDef );
- CleanupStack::PushL( &modifyObjectCondition );
+ modifyCondition->AddObjectConditionL( imageDef );
- CMdEPropertyCondition& modifyPropertyCondition = modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
- CleanupStack::PushL( &modifyPropertyCondition );
+ modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
// add observers
iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd );
@@ -337,7 +332,7 @@
// modify observer
iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify );
- CleanupStack::Pop( 6, addCondition );
+ CleanupStack::Pop( 2, addCondition );
TN_DEBUG1( "CThumbAGImageObserver::AddObserversL() - end" );
OstTrace0( TRACE_FATAL, DUP1_CTHUMBAGIMAGEOBSERVER_ADDOBSERVERSL, "CThumbAGImageObserver::AddObserversL - end" );
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagprocessor.cpp Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagprocessor.cpp Fri Sep 03 10:29:37 2010 +0300
@@ -1210,7 +1210,7 @@
TN_DEBUG2( "CThumbAGProcessor::RunL() iHarvesterClient observer err = %d", err);
OstTrace1( TRACE_NORMAL, DUP9_CTHUMBAGPROCESSOR_RUNL, "CThumbAGProcessor::RunL - iHarvesterClient observer;err=%d", err );
- if( !err )
+ if( err != KErrNone )
{
TN_DEBUG1( "CThumbAGProcessor::RunL() add iHarvesterClient observer failed");
OstTrace0( TRACE_NORMAL, DUP10_CTHUMBAGPROCESSOR_RUNL, "CThumbAGProcessor::RunL - add iHarvesterClient observer failed" );
@@ -2043,18 +2043,11 @@
CMdELogicCondition& rootCondition = iQueryAllItems->Conditions();
rootCondition.SetOperator( ELogicConditionOperatorOr );
- CMdEObjectCondition& imageObjectCondition = rootCondition.AddObjectConditionL(imageObjDef);
- CleanupStack::PushL( &imageObjectCondition );
-
- CMdEObjectCondition& videoObjectCondition = rootCondition.AddObjectConditionL(videoObjDef);
- CleanupStack::PushL( &videoObjectCondition );
-
- CMdEObjectCondition& audioObjectCondition = rootCondition.AddObjectConditionL(audioObjDef);
- CleanupStack::PushL( &audioObjectCondition );
+ rootCondition.AddObjectConditionL(imageObjDef);
+ rootCondition.AddObjectConditionL(videoObjDef);
+ rootCondition.AddObjectConditionL(audioObjDef);
iQueryAllItems->FindL(KMdEQueryDefaultMaxCount, KMaxQueryBatchSize);
-
- CleanupStack::Pop(3, &imageObjectCondition);
TN_DEBUG1( "CThumbAGProcessor::QueryAllItemsL - end" );
OstTrace0( TRACE_NORMAL, DUP3_CTHUMBAGPROCESSOR_QUERYALLITEMSL, "CThumbAGProcessor::QueryAllItemsL" );
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagvideoobserver.cpp Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/src/thumbagvideoobserver.cpp Fri Sep 03 10:29:37 2010 +0300
@@ -331,19 +331,14 @@
// set observing conditions
CMdELogicCondition* addCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
+ addCondition->AddObjectConditionL( videoDef );
- CMdEObjectCondition& addObjectCondition = addCondition->AddObjectConditionL( videoDef );
- CleanupStack::PushL( &addObjectCondition );
-
- CMdEPropertyCondition& addPropertyCondition = addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
- CleanupStack::PushL( &addPropertyCondition );
+ addCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
CMdELogicCondition* modifyCondition = CMdELogicCondition::NewLC( ELogicConditionOperatorAnd );
- CMdEObjectCondition& modifyObjectCondition = modifyCondition->AddObjectConditionL( videoDef );
- CleanupStack::PushL( &modifyObjectCondition );
-
- CMdEPropertyCondition& modifyPropertyCondition = modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
- CleanupStack::PushL( &modifyPropertyCondition );
+ modifyCondition->AddObjectConditionL( videoDef );
+
+ modifyCondition->AddPropertyConditionL( originPropDef, TMdEUintNotEqual(MdeConstants::Object::ECamera));
// add observer
iMdESession->AddObjectObserverL( *this, addCondition, ENotifyAdd );
@@ -351,7 +346,7 @@
// modify observer
iMdESession->AddObjectObserverL( *this, modifyCondition, ENotifyModify );
- CleanupStack::Pop( 6, addCondition );
+ CleanupStack::Pop( 2, addCondition );
TN_DEBUG1( "CThumbAGVideoObserver::AddObserversL() - end" );
OstTrace0( TRACE_NORMAL, DUP1_CTHUMBAGVIDEOOBSERVER_ADDOBSERVERSL, "CThumbAGVideoObserver::AddObserversL - end" );
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailgeneratetask.cpp Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailgeneratetask.cpp Fri Sep 03 10:29:37 2010 +0300
@@ -369,7 +369,8 @@
{
const TInt count = iMissingSizes->Count();
- for ( TInt i( 0 ); i < count; i++ )
+ // scale small thumbs first, because fullscreen encoding takes longer
+ for ( TInt i( count-1 ); i >= 0; i-- )
{
TThumbnailSize size = (*iMissingSizes)[ i ].iType;
#ifdef _DEBUG
@@ -383,7 +384,8 @@
if ( size == EFullScreenThumbnailSize ||
size == EVideoFullScreenThumbnailSize ||
size == EAudioFullScreenThumbnailSize ||
- size == EImageFullScreenThumbnailSize )
+ size == EImageFullScreenThumbnailSize ||
+ size == EContactFullScreenThumbnailSize )
{
TInt mis_width = (*iMissingSizes)[ i ].iSize.iWidth;
TN_DEBUG2( "*iMissingSizes)[ i ].iWidth == %d", (*iMissingSizes)[ i ].iSize.iWidth );
@@ -445,7 +447,8 @@
if ( iThumbnailSize == EFullScreenThumbnailSize ||
iThumbnailSize == EVideoFullScreenThumbnailSize ||
iThumbnailSize == EAudioFullScreenThumbnailSize ||
- iThumbnailSize == EImageFullScreenThumbnailSize )
+ iThumbnailSize == EImageFullScreenThumbnailSize ||
+ iThumbnailSize == EContactFullScreenThumbnailSize)
{
TInt width = iSize.iWidth;
iSize.iWidth = iSize.iHeight;
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailscaletask.cpp Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailscaletask.cpp Fri Sep 03 10:29:37 2010 +0300
@@ -260,7 +260,8 @@
if ( (iThumbnailSize == EFullScreenThumbnailSize ||
iThumbnailSize == EImageFullScreenThumbnailSize ||
iThumbnailSize == EVideoFullScreenThumbnailSize ||
- iThumbnailSize == EAudioFullScreenThumbnailSize) &&
+ iThumbnailSize == EAudioFullScreenThumbnailSize ||
+ iThumbnailSize == EContactFullScreenThumbnailSize) &&
iOriginalSize.iHeight < iTargetSize.iHeight &&
iOriginalSize.iWidth < iTargetSize.iWidth )
{
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailserversession.cpp Fri Sep 03 10:29:37 2010 +0300
@@ -852,7 +852,8 @@
TSize bitmapSize = bitmap->SizeInPixels();
- for ( TInt i( 0 ); i < count; i++ )
+ // scale small thumbs first, because fullscreen encoding takes longer
+ for ( TInt i( count-1 ); i >= 0; i-- )
{
if( bitmapSize.iWidth < bitmapSize.iHeight )
{
@@ -861,7 +862,8 @@
if ( size == EFullScreenThumbnailSize ||
size == EVideoFullScreenThumbnailSize ||
size == EAudioFullScreenThumbnailSize ||
- size == EImageFullScreenThumbnailSize )
+ size == EImageFullScreenThumbnailSize ||
+ size == EContactFullScreenThumbnailSize )
{
TInt height = (*missingSizes)[i].iSize.iHeight;
(*missingSizes)[i].iSize.iHeight = (*missingSizes)[i].iSize.iWidth;
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailstore.cpp Mon Aug 23 13:32:17 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailstore.cpp Fri Sep 03 10:29:37 2010 +0300
@@ -1370,8 +1370,10 @@
flags |= KThumbnailDbFlagBlacklisted;
}
- if( (aThumbnailSize == EImageFullScreenThumbnailSize || aThumbnailSize == EVideoFullScreenThumbnailSize ||
- aThumbnailSize == EAudioFullScreenThumbnailSize) && !aBlackListed )
+ if( (aThumbnailSize == EImageFullScreenThumbnailSize ||
+ aThumbnailSize == EVideoFullScreenThumbnailSize ||
+ aThumbnailSize == EAudioFullScreenThumbnailSize ||
+ aThumbnailSize == EContactFullScreenThumbnailSize) && !aBlackListed )
{
TN_DEBUG1( "CThumbnailStore::StoreThumbnailL( public ) - encode jpg" );
OstTrace0( TRACE_NORMAL, DUP11_CTHUMBNAILSTORE_STORETHUMBNAILL, "CThumbnailStore::StoreThumbnailL - encode jpg" );
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml Fri Sep 03 10:29:37 2010 +0300
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="imghandling" name="Image Handling" levels="lib util if">
+ <collection id="imagehandling_plat" name="Image Handling Platform Interfaces" level="if">
+ <component id="image_handling_library_api" name="Image Handling Library API" class="api" filter="s60">
+ <meta rel="Api" href="imagehandling_plat/image_handling_library_api/image_handling_library_api.metaxml"/>
+ <unit bldFile="imagehandling_plat/image_handling_library_api/group"/>
+ </component>
+ <component id="3gp_library_api" name="3GP Library API" class="api" filter="s60">
+ <meta rel="Api" href="imagehandling_plat/3gp_library_api/3gp_library_api.metaxml"/>
+ <unit bldFile="imagehandling_plat/3gp_library_api/group"/>
+ </component>
+ <component id="thumbnailmanager_api" name="Thumbnail Manager API" class="api" filter="s60">
+ <meta rel="Api" href="imagehandling_plat/thumbnailmanager_api/thumbnailmanager_api.metaxml"/>
+ <unit bldFile="imagehandling_plat/thumbnailmanager_api/group" filter="!test"/>
+ <unit bldFile="imagehandling_plat/thumbnailmanager_api/tsrc/group" filter="test,api_test"/>
+ </component>
+ </collection>
+ <collection id="imagehandlinglib" name="Image Handling Library" level="lib">
+ <!-- collection is really a component, need to move down a directory -->
+ <component id="ihl" filter="s60" name="IHL">
+ <unit bldFile="imagehandlinglib/group"/>
+ </component>
+ <component id="imagehandlinglib_api" filter="s60,test,api_test" name="Image Handling Library API Test" purpose="development">
+ <unit bldFile="imagehandlinglib/tsrc/public/basic/group"/>
+ </component>
+ </collection>
+ <collection id="imagehandlingutilities" name="Image Handling Utilities" level="util">
+ <component id="thumbnailmanager" filter="s60" name="Thumbnail Manager">
+ <unit bldFile="imagehandlingutilities/thumbnailmanager/group"/>
+ </component>
+ <component id="thumbnailmanagerqt" filter="s60" name="Thumbnail Manager Qt" introduced="^4">
+ <unit bldFile="imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt" qt:proFile="thumbnailmanagerqt.pro" filter="!test"/>
+ <unit bldFile="imagehandlingutilities/thumbnailmanager/thumbnailmanagerqt/tsrc" qt:proFile="test_qtnmwrapper.pro" filter="test,unit_test"/>
+ </component>
+ </collection>
+ </package>
+</SystemDefinition>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml Fri Sep 03 10:29:37 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>