--- a/harvester/harvesterplugins/OMADRMPlugin/src/harvesteromadrmplugin.cpp	Wed Sep 01 12:24:24 2010 +0100
+++ b/harvester/harvesterplugins/OMADRMPlugin/src/harvesteromadrmplugin.cpp	Tue Sep 14 22:10:25 2010 +0300
@@ -193,7 +193,7 @@
 
 void CHarvesterOMADRMPlugin::HarvestL( CHarvesterData* aHarvesterData )
 	{
-	WRITELOG( "CHarvesterImagePlugin::HarvestL()" );
+	WRITELOG( "CHarvesterOMADRMPlugin::HarvestL()" );
     CMdEObject& mdeObject = aHarvesterData->MdeObject();
 	CDRMHarvestData* drmHarvestData = CDRMHarvestData::NewL();
 	CleanupStack::PushL( drmHarvestData );
@@ -330,31 +330,36 @@
         WRITELOG1( "CHarvesterOMADRMPlugin::GatherDataL - ERROR: getting protection info failed %d", err );
         }
       
-    CImageDecoder* decoder = NULL;
-
-    TRAP( err, decoder = CImageDecoder::FileNewL( iFs, uri, ContentAccess::EPeek, 
-            ( CImageDecoder::TOptions )( CImageDecoder::EPreferFastDecode )));
-
-    CleanupStack::PushL( decoder );
-    
-    if(decoder && !err)
+    if( aMetadataObject.Def().Name() == MdeConstants::Image::KImageObject )
         {
-        WRITELOG( "CHarvesterImagePlugin::GatherData() - Image decoder has opened the file." );        
-        // Get image width, frame count, height and bits per pixel from image decoder.
-        const TFrameInfo info = decoder->FrameInfo( 0 );
-        const TSize imageSize = info.iOverallSizeInPixels;
-        const TInt framecount = decoder->FrameCount();
-        aFileData.iFrameCount = framecount;
-        aFileData.iImageWidth = imageSize.iWidth;
-        aFileData.iImageHeight = imageSize.iHeight;
-        aFileData.iBitsPerPixel = info.iBitsPerPixel;
-        }
-    else
-        {
-        WRITELOG1( "CHarvesterImagePlugin::GatherData() - ERROR: decoder %d", err );
+        CImageDecoder* decoder = NULL;
+
+        TRAP( err, decoder = CImageDecoder::FileNewL( iFs, uri, ContentAccess::EPeek, 
+                ( CImageDecoder::TOptions )( CImageDecoder::EPreferFastDecode )));
+
+        CleanupStack::PushL( decoder );
+    
+        if(decoder && !err)
+            {
+            WRITELOG( "CHarvesterImagePlugin::GatherData() - Image decoder has opened the file." );        
+            // Get image width, frame count, height and bits per pixel from image decoder.
+            const TFrameInfo info = decoder->FrameInfo( 0 );
+            const TSize imageSize = info.iOverallSizeInPixels;
+            const TInt framecount = decoder->FrameCount();
+            aFileData.iFrameCount = framecount;
+            aFileData.iImageWidth = imageSize.iWidth;
+            aFileData.iImageHeight = imageSize.iHeight;
+            aFileData.iBitsPerPixel = info.iBitsPerPixel;
+            }
+        else
+            {
+            WRITELOG1( "CHarvesterImagePlugin::GatherData() - ERROR: decoder %d", err );
+            }    
+        CleanupStack::PopAndDestroy( decoder );
         }
 
-    CleanupStack::PopAndDestroy( 4 ); // content, data, attrSet, imagedecoder
+
+    CleanupStack::PopAndDestroy( 3 ); // content, data, attrSet
     return KErrNone;
     }