--- a/imagingext_pub/exif_api/tsrc/group/ExifLibTest.mmp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/group/ExifLibTest.mmp	Wed Oct 13 13:10:46 2010 +0300
@@ -85,8 +85,10 @@
 #ifdef          _USE_CPPUNIT_
 LIBRARY         cppunitframework.lib
 #else
-LIBRARY         stiftestinterface.lib
+LIBRARY         StifTestInterface.lib
 #endif
 
 EPOCHEAPSIZE    1 10000000
 EXPORTUNFROZEN
+
+SMPSAFE
\ No newline at end of file

--- a/imagingext_pub/exif_api/tsrc/src/ExifCreateTest.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/src/ExifCreateTest.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -25,9 +25,10 @@
 	HBufC8* jpeg = TUtils::ReadFileL(iFs, KValidJpeg);
 	CleanupStack::PushL(jpeg);
 	CExifModify* modify = CExifModify::NewL(*jpeg, CExifModify::ECreate);
+	CleanupStack::PushL(modify);
 	if(!modify)
-		User::Leave(KErrGeneral);
-	delete modify;
+        User::Leave(KErrGeneral);
+	CleanupStack::PopAndDestroy(modify);
 	CleanupStack::PopAndDestroy(jpeg);
 	}
 

--- a/imagingext_pub/exif_api/tsrc/src/ExifCreateTest100.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/src/ExifCreateTest100.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -26,7 +26,10 @@
 	CleanupStack::PushL(jpeg);
 	CExifModify* modify = CExifModify::NewL(*jpeg, CExifModify::ECreate, CExifModify::ENoJpegParsing);
 	if(!modify)
-		User::Leave(KErrGeneral);
+        {
+        delete modify;
+        User::Leave(KErrGeneral);
+        }
 	delete modify;
 	CleanupStack::PopAndDestroy(jpeg);
 	}

--- a/imagingext_pub/exif_api/tsrc/src/ExifLibTest.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/src/ExifLibTest.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -71,9 +71,9 @@
 MTest*  CExifLibTest::suiteL ()
     {
     CTestSuite *suite = CTestSuite::NewL(_L8("Test Suite Container"));
-
+    CleanupStack::PushL( suite );
     suite->addTestL(CExifLibTestInc::suiteL());
-
+    CleanupStack::Pop( suite );
     return suite;
     
     }

--- a/imagingext_pub/exif_api/tsrc/src/ExifLibTestInc.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/src/ExifLibTestInc.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -76,187 +76,189 @@
     {
     // Always use NewL (Do not use NewLC) !!!
     CTestSuite *suite = CTestSuite::NewL(_L8("ExifLibTest"));
-    
-    suite->addTestL(CTestCaller<CExifTagTest>::NewL(_L8("EXIF.TAG.001"), KWinscwChar(CExifTagTest::ExifTag001L)));
-   
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.001"), KWinscwChar(CExifReadTest::ExifRead001L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.002"), KWinscwChar(CExifReadTest::ExifRead002L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.003"), KWinscwChar(CExifReadTest::ExifRead003L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.004"), KWinscwChar(CExifReadTest::ExifRead004L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.005"), KWinscwChar(CExifReadTest::ExifRead005L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.006"), KWinscwChar(CExifReadTest::ExifRead006L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.007"), KWinscwChar(CExifReadTest::ExifRead007L)));
-
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.008"), KWinscwChar(CExifReadTest::ExifRead008L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.009"), KWinscwChar(CExifReadTest::ExifRead009L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.010"), KWinscwChar(CExifReadTest::ExifRead010L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.011"), KWinscwChar(CExifReadTest::ExifRead011L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.012"), KWinscwChar(CExifReadTest::ExifRead012L)));
+    CleanupStack::PushL( suite );
     
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.013"), KWinscwChar(CExifReadTest::ExifRead013L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.014"), KWinscwChar(CExifReadTest::ExifRead014L)));
-    
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.016"), KWinscwChar(CExifReadTest::ExifRead016L)));
+    suite->addTestL(CTestCaller<CExifTagTest>::NewL(_L8("EXIF.TAG.001"), KWinscwChar CExifTagTest::ExifTag001L ));
+   
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.001"), KWinscwChar CExifReadTest::ExifRead001L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.002"), KWinscwChar CExifReadTest::ExifRead002L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.003"), KWinscwChar CExifReadTest::ExifRead003L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.004"), KWinscwChar CExifReadTest::ExifRead004L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.005"), KWinscwChar CExifReadTest::ExifRead005L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.006"), KWinscwChar CExifReadTest::ExifRead006L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.007"), KWinscwChar CExifReadTest::ExifRead007L ));
+
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.008"), KWinscwChar CExifReadTest::ExifRead008L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.009"), KWinscwChar CExifReadTest::ExifRead009L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.010"), KWinscwChar CExifReadTest::ExifRead010L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.011"), KWinscwChar CExifReadTest::ExifRead011L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.012"), KWinscwChar CExifReadTest::ExifRead012L ));
+     
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.013"), KWinscwChar CExifReadTest::ExifRead013L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.014"), KWinscwChar CExifReadTest::ExifRead014L ));
     
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.001"), KWinscwChar(CExifCreateTest::ExifCreate001L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.002"), KWinscwChar(CExifCreateTest::ExifCreate002L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.003"), KWinscwChar(CExifCreateTest::ExifCreate003L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.004"), KWinscwChar(CExifCreateTest::ExifCreate004L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.005"), KWinscwChar(CExifCreateTest::ExifCreate005L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.006"), KWinscwChar(CExifCreateTest::ExifCreate006L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.007"), KWinscwChar(CExifCreateTest::ExifCreate007L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.008"), KWinscwChar(CExifCreateTest::ExifCreate008L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.009"), KWinscwChar(CExifCreateTest::ExifCreate009L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.010"), KWinscwChar(CExifCreateTest::ExifCreate010L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.011"), KWinscwChar(CExifCreateTest::ExifCreate011L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.012"), KWinscwChar(CExifCreateTest::ExifCreate012L)));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.016"), KWinscwChar CExifReadTest::ExifRead016L ));
+    
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.001"), KWinscwChar CExifCreateTest::ExifCreate001L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.002"), KWinscwChar CExifCreateTest::ExifCreate002L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.003"), KWinscwChar CExifCreateTest::ExifCreate003L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.004"), KWinscwChar CExifCreateTest::ExifCreate004L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.005"), KWinscwChar CExifCreateTest::ExifCreate005L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.006"), KWinscwChar CExifCreateTest::ExifCreate006L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.007"), KWinscwChar CExifCreateTest::ExifCreate007L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.008"), KWinscwChar CExifCreateTest::ExifCreate008L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.009"), KWinscwChar CExifCreateTest::ExifCreate009L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.010"), KWinscwChar CExifCreateTest::ExifCreate010L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.011"), KWinscwChar CExifCreateTest::ExifCreate011L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.012"), KWinscwChar CExifCreateTest::ExifCreate012L ));
    
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.001"), KWinscwChar(CExifModifyTest::ExifModify001L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.002"), KWinscwChar(CExifModifyTest::ExifModify002L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.003"), KWinscwChar(CExifModifyTest::ExifModify003L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.004"), KWinscwChar(CExifModifyTest::ExifModify004L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.005"), KWinscwChar(CExifModifyTest::ExifModify005L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.006"), KWinscwChar(CExifModifyTest::ExifModify006L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.007"), KWinscwChar(CExifModifyTest::ExifModify007L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.008"), KWinscwChar(CExifModifyTest::ExifModify008L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.009"), KWinscwChar(CExifModifyTest::ExifModify009L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.010"), KWinscwChar(CExifModifyTest::ExifModify010L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.011"), KWinscwChar(CExifModifyTest::ExifModify011L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.012"), KWinscwChar(CExifModifyTest::ExifModify012L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.013"), KWinscwChar(CExifModifyTest::ExifModify013L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.014"), KWinscwChar(CExifModifyTest::ExifModify014L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.015"), KWinscwChar(CExifModifyTest::ExifModify015L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.016"), KWinscwChar(CExifModifyTest::ExifModify016L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.018"), KWinscwChar(CExifModifyTest::ExifModify018L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.019"), KWinscwChar(CExifModifyTest::ExifModify019L)));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.001"), KWinscwChar CExifModifyTest::ExifModify001L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.002"), KWinscwChar CExifModifyTest::ExifModify002L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.003"), KWinscwChar CExifModifyTest::ExifModify003L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.004"), KWinscwChar CExifModifyTest::ExifModify004L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.005"), KWinscwChar CExifModifyTest::ExifModify005L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.006"), KWinscwChar CExifModifyTest::ExifModify006L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.007"), KWinscwChar CExifModifyTest::ExifModify007L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.008"), KWinscwChar CExifModifyTest::ExifModify008L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.009"), KWinscwChar CExifModifyTest::ExifModify009L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.010"), KWinscwChar CExifModifyTest::ExifModify010L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.011"), KWinscwChar CExifModifyTest::ExifModify011L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.012"), KWinscwChar CExifModifyTest::ExifModify012L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.013"), KWinscwChar CExifModifyTest::ExifModify013L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.014"), KWinscwChar CExifModifyTest::ExifModify014L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.015"), KWinscwChar CExifModifyTest::ExifModify015L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.016"), KWinscwChar CExifModifyTest::ExifModify016L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.018"), KWinscwChar CExifModifyTest::ExifModify018L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.019"), KWinscwChar CExifModifyTest::ExifModify019L ));
 
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.001"), KWinscwChar(CExifModifyTest2::ExifModify001L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.002"), KWinscwChar(CExifModifyTest2::ExifModify002L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.003"), KWinscwChar(CExifModifyTest2::ExifModify003L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.004"), KWinscwChar(CExifModifyTest2::ExifModify004L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.005"), KWinscwChar(CExifModifyTest2::ExifModify005L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.006"), KWinscwChar(CExifModifyTest2::ExifModify006L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.007"), KWinscwChar(CExifModifyTest2::ExifModify007L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.008"), KWinscwChar(CExifModifyTest2::ExifModify008L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.009"), KWinscwChar(CExifModifyTest2::ExifModify009L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.010"), KWinscwChar(CExifModifyTest2::ExifModify010L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.011"), KWinscwChar(CExifModifyTest2::ExifModify011L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.012"), KWinscwChar(CExifModifyTest2::ExifModify012L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.013"), KWinscwChar(CExifModifyTest2::ExifModify013L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.014"), KWinscwChar(CExifModifyTest2::ExifModify014L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.015"), KWinscwChar(CExifModifyTest2::ExifModify015L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.016"), KWinscwChar(CExifModifyTest2::ExifModify016L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.018"), KWinscwChar(CExifModifyTest2::ExifModify018L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.019"), KWinscwChar(CExifModifyTest2::ExifModify019L)));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.001"), KWinscwChar CExifModifyTest2::ExifModify001L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.002"), KWinscwChar CExifModifyTest2::ExifModify002L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.003"), KWinscwChar CExifModifyTest2::ExifModify003L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.004"), KWinscwChar CExifModifyTest2::ExifModify004L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.005"), KWinscwChar CExifModifyTest2::ExifModify005L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.006"), KWinscwChar CExifModifyTest2::ExifModify006L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.007"), KWinscwChar CExifModifyTest2::ExifModify007L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.008"), KWinscwChar CExifModifyTest2::ExifModify008L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.009"), KWinscwChar CExifModifyTest2::ExifModify009L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.010"), KWinscwChar CExifModifyTest2::ExifModify010L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.011"), KWinscwChar CExifModifyTest2::ExifModify011L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.012"), KWinscwChar CExifModifyTest2::ExifModify012L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.013"), KWinscwChar CExifModifyTest2::ExifModify013L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.014"), KWinscwChar CExifModifyTest2::ExifModify014L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.015"), KWinscwChar CExifModifyTest2::ExifModify015L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.016"), KWinscwChar CExifModifyTest2::ExifModify016L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.018"), KWinscwChar CExifModifyTest2::ExifModify018L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.019"), KWinscwChar CExifModifyTest2::ExifModify019L ));
 
     // Fast parser test cases
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.101"), KWinscwChar(CExifReadTest::ExifRead101L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.102"), KWinscwChar(CExifReadTest::ExifRead102L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.103"), KWinscwChar(CExifReadTest::ExifRead103L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.104"), KWinscwChar(CExifReadTest::ExifRead104L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.105"), KWinscwChar(CExifReadTest::ExifRead105L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.106"), KWinscwChar(CExifReadTest::ExifRead106L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.107"), KWinscwChar(CExifReadTest::ExifRead107L)));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.101"), KWinscwChar CExifReadTest::ExifRead101L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.102"), KWinscwChar CExifReadTest::ExifRead102L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.103"), KWinscwChar CExifReadTest::ExifRead103L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.104"), KWinscwChar CExifReadTest::ExifRead104L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.105"), KWinscwChar CExifReadTest::ExifRead105L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.106"), KWinscwChar CExifReadTest::ExifRead106L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.107"), KWinscwChar CExifReadTest::ExifRead107L ));
 
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.108"), KWinscwChar(CExifReadTest::ExifRead108L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.109"), KWinscwChar(CExifReadTest::ExifRead109L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.110"), KWinscwChar(CExifReadTest::ExifRead110L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.111"), KWinscwChar(CExifReadTest::ExifRead111L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.112"), KWinscwChar(CExifReadTest::ExifRead112L)));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.108"), KWinscwChar CExifReadTest::ExifRead108L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.109"), KWinscwChar CExifReadTest::ExifRead109L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.110"), KWinscwChar CExifReadTest::ExifRead110L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.111"), KWinscwChar CExifReadTest::ExifRead111L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.112"), KWinscwChar CExifReadTest::ExifRead112L ));
+ 
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.113"), KWinscwChar CExifReadTest::ExifRead113L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.114"), KWinscwChar CExifReadTest::ExifRead114L ));
     
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.113"), KWinscwChar(CExifReadTest::ExifRead113L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.114"), KWinscwChar(CExifReadTest::ExifRead114L)));
-    
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.116"), KWinscwChar(CExifReadTest::ExifRead116L)));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.116"), KWinscwChar CExifReadTest::ExifRead116L ));
     
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.101"), KWinscwChar(CExifCreateTest::ExifCreate101L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.102"), KWinscwChar(CExifCreateTest::ExifCreate102L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.103"), KWinscwChar(CExifCreateTest::ExifCreate103L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.104"), KWinscwChar(CExifCreateTest::ExifCreate104L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.105"), KWinscwChar(CExifCreateTest::ExifCreate105L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.106"), KWinscwChar(CExifCreateTest::ExifCreate106L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.107"), KWinscwChar(CExifCreateTest::ExifCreate107L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.108"), KWinscwChar(CExifCreateTest::ExifCreate108L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.109"), KWinscwChar(CExifCreateTest::ExifCreate109L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.110"), KWinscwChar(CExifCreateTest::ExifCreate110L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.111"), KWinscwChar(CExifCreateTest::ExifCreate111L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.112"), KWinscwChar(CExifCreateTest::ExifCreate112L)));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.101"), KWinscwChar CExifCreateTest::ExifCreate101L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.102"), KWinscwChar CExifCreateTest::ExifCreate102L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.103"), KWinscwChar CExifCreateTest::ExifCreate103L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.104"), KWinscwChar CExifCreateTest::ExifCreate104L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.105"), KWinscwChar CExifCreateTest::ExifCreate105L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.106"), KWinscwChar CExifCreateTest::ExifCreate106L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.107"), KWinscwChar CExifCreateTest::ExifCreate107L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.108"), KWinscwChar CExifCreateTest::ExifCreate108L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.109"), KWinscwChar CExifCreateTest::ExifCreate109L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.110"), KWinscwChar CExifCreateTest::ExifCreate110L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.111"), KWinscwChar CExifCreateTest::ExifCreate111L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.112"), KWinscwChar CExifCreateTest::ExifCreate112L ));
    
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.101"), KWinscwChar(CExifModifyTest::ExifModify101L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.102"), KWinscwChar(CExifModifyTest::ExifModify102L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.103"), KWinscwChar(CExifModifyTest::ExifModify103L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.104"), KWinscwChar(CExifModifyTest::ExifModify104L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.105"), KWinscwChar(CExifModifyTest::ExifModify105L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.106"), KWinscwChar(CExifModifyTest::ExifModify106L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.107"), KWinscwChar(CExifModifyTest::ExifModify107L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.108"), KWinscwChar(CExifModifyTest::ExifModify108L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.109"), KWinscwChar(CExifModifyTest::ExifModify109L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.110"), KWinscwChar(CExifModifyTest::ExifModify110L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.111"), KWinscwChar(CExifModifyTest::ExifModify111L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.112"), KWinscwChar(CExifModifyTest::ExifModify112L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.113"), KWinscwChar(CExifModifyTest::ExifModify113L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.114"), KWinscwChar(CExifModifyTest::ExifModify114L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.115"), KWinscwChar(CExifModifyTest::ExifModify115L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.116"), KWinscwChar(CExifModifyTest::ExifModify116L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.118"), KWinscwChar(CExifModifyTest::ExifModify118L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.119"), KWinscwChar(CExifModifyTest::ExifModify119L)));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.101"), KWinscwChar CExifModifyTest::ExifModify101L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.102"), KWinscwChar CExifModifyTest::ExifModify102L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.103"), KWinscwChar CExifModifyTest::ExifModify103L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.104"), KWinscwChar CExifModifyTest::ExifModify104L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.105"), KWinscwChar CExifModifyTest::ExifModify105L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.106"), KWinscwChar CExifModifyTest::ExifModify106L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.107"), KWinscwChar CExifModifyTest::ExifModify107L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.108"), KWinscwChar CExifModifyTest::ExifModify108L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.109"), KWinscwChar CExifModifyTest::ExifModify109L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.110"), KWinscwChar CExifModifyTest::ExifModify110L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.111"), KWinscwChar CExifModifyTest::ExifModify111L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.112"), KWinscwChar CExifModifyTest::ExifModify112L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.113"), KWinscwChar CExifModifyTest::ExifModify113L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.114"), KWinscwChar CExifModifyTest::ExifModify114L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.115"), KWinscwChar CExifModifyTest::ExifModify115L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.116"), KWinscwChar CExifModifyTest::ExifModify116L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.118"), KWinscwChar CExifModifyTest::ExifModify118L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.119"), KWinscwChar CExifModifyTest::ExifModify119L ));
 
     // No tag validity check test cases
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.201"), KWinscwChar(CExifReadTest::ExifRead201L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.202"), KWinscwChar(CExifReadTest::ExifRead202L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.203"), KWinscwChar(CExifReadTest::ExifRead203L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.204"), KWinscwChar(CExifReadTest::ExifRead204L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.205"), KWinscwChar(CExifReadTest::ExifRead205L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.206"), KWinscwChar(CExifReadTest::ExifRead206L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.207"), KWinscwChar(CExifReadTest::ExifRead207L)));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.201"), KWinscwChar CExifReadTest::ExifRead201L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.202"), KWinscwChar CExifReadTest::ExifRead202L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.203"), KWinscwChar CExifReadTest::ExifRead203L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.204"), KWinscwChar CExifReadTest::ExifRead204L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.205"), KWinscwChar CExifReadTest::ExifRead205L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.206"), KWinscwChar CExifReadTest::ExifRead206L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.207"), KWinscwChar CExifReadTest::ExifRead207L ));
 
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.208"), KWinscwChar(CExifReadTest::ExifRead208L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.209"), KWinscwChar(CExifReadTest::ExifRead209L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.210"), KWinscwChar(CExifReadTest::ExifRead210L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.211"), KWinscwChar(CExifReadTest::ExifRead211L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.212"), KWinscwChar(CExifReadTest::ExifRead212L)));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.208"), KWinscwChar CExifReadTest::ExifRead208L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.209"), KWinscwChar CExifReadTest::ExifRead209L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.210"), KWinscwChar CExifReadTest::ExifRead210L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.211"), KWinscwChar CExifReadTest::ExifRead211L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.212"), KWinscwChar CExifReadTest::ExifRead212L ));
     
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.213"), KWinscwChar(CExifReadTest::ExifRead213L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.214"), KWinscwChar(CExifReadTest::ExifRead214L)));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.213"), KWinscwChar CExifReadTest::ExifRead213L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.214"), KWinscwChar CExifReadTest::ExifRead214L ));
     
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.216"), KWinscwChar(CExifReadTest::ExifRead216L)));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.216"), KWinscwChar CExifReadTest::ExifRead216L ));
 
     // IOP test
 
-    suite->addTestL(CTestCaller<CExifIopTest>::NewL(_L8("EXIF.IOP.001"), KWinscwChar(CExifIopTest::ExifIop001L)));
-	suite->addTestL(CTestCaller<CExifIopTest>::NewL(_L8("EXIF.IOP.002"), KWinscwChar(CExifIopTest::ExifIop002L)));
+    suite->addTestL(CTestCaller<CExifIopTest>::NewL(_L8("EXIF.IOP.001"), KWinscwChar CExifIopTest::ExifIop001L ));
+	suite->addTestL(CTestCaller<CExifIopTest>::NewL(_L8("EXIF.IOP.002"), KWinscwChar CExifIopTest::ExifIop002L ));
     
-    suite->addTestL(CTestCaller<CExifIopTest>::NewL(_L8("EXIF.IOP.003"), KWinscwChar(CExifIopTest::ExifIop003L)));
+    suite->addTestL(CTestCaller<CExifIopTest>::NewL(_L8("EXIF.IOP.003"), KWinscwChar CExifIopTest::ExifIop003L ));
     
     // CameraAPI test case
-    suite->addTestL(CTestCaller<CExifIopTest>::NewL(_L8("EXIF.IOP.005"), KWinscwChar(CExifIopTest::ExifIop005L)));
+    suite->addTestL(CTestCaller<CExifIopTest>::NewL(_L8("EXIF.IOP.005"), KWinscwChar CExifIopTest::ExifIop005L ));
 
     // OOM tests
 //#if ( ( defined __WINS__ ) || ( defined __WINSCW__) )
 
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.MEM.015"), KWinscwChar(CExifReadTest::ExifRead015L)));
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.MEM.115"), KWinscwChar(CExifReadTest::ExifRead115L)));
-    suite->addTestL(CTestCaller<CExifTagTest>::NewL(_L8("EXIF.TAG.MEM.002"), KWinscwChar(CExifTagTest::ExifTag002L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.MEM.013"), KWinscwChar(CExifCreateTest::ExifCreate013L)));
-    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.MEM.113"), KWinscwChar(CExifCreateTest::ExifCreate113L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.MEM.017"), KWinscwChar(CExifModifyTest::ExifModify017L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.MEM.117"), KWinscwChar(CExifModifyTest::ExifModify117L)));
-    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.MEM.017"), KWinscwChar(CExifModifyTest2::ExifModify017L)));
-    suite->addTestL(CTestCaller<CExifIopTest>::NewL(_L8("EXIF.IOP.MEM.004"), KWinscwChar(CExifIopTest::ExifIop004L)));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.MEM.015"), KWinscwChar CExifReadTest::ExifRead015L ));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.MEM.115"), KWinscwChar CExifReadTest::ExifRead115L ));
+    suite->addTestL(CTestCaller<CExifTagTest>::NewL(_L8("EXIF.TAG.MEM.002"), KWinscwChar CExifTagTest::ExifTag002L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.MEM.013"), KWinscwChar CExifCreateTest::ExifCreate013L ));
+    suite->addTestL(CTestCaller<CExifCreateTest>::NewL(_L8("EXIF.CREATE.MEM.113"), KWinscwChar CExifCreateTest::ExifCreate113L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.MEM.017"), KWinscwChar CExifModifyTest::ExifModify017L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.MEM.117"), KWinscwChar CExifModifyTest::ExifModify117L ));
+    suite->addTestL(CTestCaller<CExifModifyTest2>::NewL(_L8("EXIF.MODIFY2.MEM.017"), KWinscwChar CExifModifyTest2::ExifModify017L ));
+    suite->addTestL(CTestCaller<CExifIopTest>::NewL(_L8("EXIF.IOP.MEM.004"), KWinscwChar CExifIopTest::ExifIop004L ));
 
 //#endif
     // Fast parser test cases
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.FAST.017"), KWinscwChar(CExifReadTest::ExifRead017L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.FAST.020"), KWinscwChar(CExifModifyTest::ExifModify020L)));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.FAST.017"), KWinscwChar CExifReadTest::ExifRead017L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.FAST.020"), KWinscwChar CExifModifyTest::ExifModify020L ));
 
     // Unknown tags test cases
     // Modify image that has unknown (vendor specific) tags and write it back. This needs manual verification
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.UNKNOWN.021"), KWinscwChar(CExifModifyTest::ExifModify021L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.UNKNOWN.022"), KWinscwChar(CExifModifyTest::ExifModify022L)));
-    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.UNKNOWN.023"), KWinscwChar(CExifModifyTest::ExifModify023L)));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.UNKNOWN.021"), KWinscwChar CExifModifyTest::ExifModify021L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.UNKNOWN.022"), KWinscwChar CExifModifyTest::ExifModify022L ));
+    suite->addTestL(CTestCaller<CExifModifyTest>::NewL(_L8("EXIF.MODIFY.UNKNOWN.023"), KWinscwChar CExifModifyTest::ExifModify023L ));
 
     // No tag validity checking test cases
-    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.NOTAGCHECKING.018"), KWinscwChar(CExifReadTest::ExifRead018L)));
+    suite->addTestL(CTestCaller<CExifReadTest>::NewL(_L8("EXIF.READ.NOTAGCHECKING.018"), KWinscwChar CExifReadTest::ExifRead018L ));
+    CleanupStack::Pop( suite );
 
     return suite;
     }

--- a/imagingext_pub/exif_api/tsrc/src/ExifModifyTest.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/src/ExifModifyTest.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -27,7 +27,10 @@
 	CleanupStack::PushL(exif);
 	CExifModify* modify = CExifModify::NewL(*exif, CExifModify::EModify);
 	if(!modify)
+	    {
+        delete modify;
 		User::Leave(KErrGeneral);
+        }
 	delete modify;
 	CleanupStack::PopAndDestroy(exif);
     
@@ -2181,9 +2184,9 @@
 	HBufC8* exif = TUtils::ReadFileL(iFs, KFullExif);
 	CleanupStack::PushL(exif);
 	CExifModify* modify = CExifModify::NewL(*exif, CExifModify::EModify, CExifModify::ENoJpegParsing);
+	CleanupStack::PushL(modify);
 	if(!modify)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(modify);
     modify->SetCustomRenderedL(0);
     HBufC8* buffer = modify->WriteDataL(*exif);
     CleanupStack::PopAndDestroy(modify);
@@ -2244,9 +2247,9 @@
 	HBufC8* exif = TUtils::ReadFileL(iFs, KUnknown_tags);
 	CleanupStack::PushL(exif);
 	CExifModify* modify = CExifModify::NewL(*exif, CExifModify::EModify, CExifModify::ENoJpegParsing | CExifModify::ENoTagChecking );
+	CleanupStack::PushL(modify);
 	if(!modify)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(modify);
 
 
   RDebug::Print(_L("CExifModifyTest: modify tag SetOrientationL"));
@@ -2305,9 +2308,9 @@
 	HBufC8* exif = TUtils::ReadFileL(iFs, KNoTagChk_IMG_AN19);
 	CleanupStack::PushL(exif);
 	CExifModify* modify = CExifModify::NewL(*exif, CExifModify::EModify, CExifModify::ENoJpegParsing | CExifModify::ENoTagChecking );
+	CleanupStack::PushL(modify);
 	if(!modify)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(modify);
 
 
   RDebug::Print(_L("CExifModifyTest: modify tag SetOrientationL"));
@@ -2366,9 +2369,9 @@
 	HBufC8* exif = TUtils::ReadFileL(iFs, KtagInWrongIfd);
 	CleanupStack::PushL(exif);
 	CExifModify* modify = CExifModify::NewL(*exif, CExifModify::EModify, CExifModify::ENoJpegParsing | CExifModify::ENoTagChecking );
+	CleanupStack::PushL(modify);
 	if(!modify)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(modify);
 
 
   RDebug::Print(_L("CExifModifyTest: modify tag SetOrientationL"));

--- a/imagingext_pub/exif_api/tsrc/src/ExifModifyTest100.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/src/ExifModifyTest100.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -28,7 +28,10 @@
 	CleanupStack::PushL(exif);
 	CExifModify* modify = CExifModify::NewL(*exif, CExifModify::EModify, CExifModify::ENoJpegParsing);
 	if(!modify)
+	    {
+        delete modify;
 		User::Leave(KErrGeneral);
+        }
 	delete modify;
 	CleanupStack::PopAndDestroy(exif);
     

--- a/imagingext_pub/exif_api/tsrc/src/ExifModifyTest2.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/src/ExifModifyTest2.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -24,7 +24,10 @@
 	{
 	CExifModify* modify = CExifModify::NewL();
 	if(!modify)
+	    {
+	    delete modify;
 		User::Leave(KErrGeneral);
+        }
 	delete modify;
 	}
 

--- a/imagingext_pub/exif_api/tsrc/src/ExifReadTest.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/src/ExifReadTest.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -26,7 +26,10 @@
 	CleanupStack::PushL(exif);
 	CExifRead* read = CExifRead::NewL(*exif);
 	if(!read)
+	    {
+        delete read;
 		User::Leave(KErrGeneral);
+        }
 	delete read;
 	CleanupStack::PopAndDestroy(exif);
 	}
@@ -1454,9 +1457,9 @@
 
 	RDebug::Print(_L("Instantiate CExifRead..."));
 	CExifRead* read = CExifRead::NewL(*exif);
+	CleanupStack::PushL(read);
 	if(!read)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(read);
 	
 	RDebug::Print(_L("Read thumbnail..."));
 	HBufC8* thumbnail = read->GetThumbnailL();
@@ -1478,9 +1481,9 @@
 
 	RDebug::Print(_L("Instantiate CExifRead no jpeg..."));
 	read = CExifRead::NewL(*exif, CExifRead::ENoJpeg);
+	CleanupStack::PushL(read);
 	if(!read)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(read);
 	
 	RDebug::Print(_L("Read thumbnail..."));
 	thumbnail = read->GetThumbnailL();
@@ -1501,9 +1504,9 @@
 
 	RDebug::Print(_L("Instantiate CExifRead..."));
 	read = CExifRead::NewL(*exif);
+	CleanupStack::PushL(read);
 	if(!read)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(read);
 	
 	RDebug::Print(_L("Read thumbnail..."));
 	thumbnail = read->GetThumbnailL();
@@ -1524,9 +1527,9 @@
 
 	RDebug::Print(_L("Instantiate CExifRead no jpeg..."));
 	read = CExifRead::NewL(*exif, CExifRead::ENoJpeg);
+	CleanupStack::PushL(read);
 	if(!read)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(read);
 	
 	RDebug::Print(_L("Read thumbnail..."));
 	thumbnail = read->GetThumbnailL();
@@ -1555,9 +1558,9 @@
 
 	RDebug::Print(_L("Instantiate CExifRead and ignore unknown/missing tags..."));
 	CExifRead* read = CExifRead::NewL(*exif, CExifRead::ENoTagChecking);
+	CleanupStack::PushL(read);
 	if(!read)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(read);
 	
 	RDebug::Print(_L("Read thumbnail..."));
 	HBufC8* thumbnail = read->GetThumbnailL();
@@ -1598,9 +1601,9 @@
 
 	RDebug::Print(_L("Instantiate CExifRead and ignore unknown/missing tags..."));
 	read = CExifRead::NewL(*exif, CExifRead::ENoTagChecking);
+	CleanupStack::PushL(read);
 	if(!read)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(read);
 	
 	RDebug::Print(_L("Read thumbnail..."));
 	thumbnail = read->GetThumbnailL();
@@ -1641,9 +1644,9 @@
 
 	RDebug::Print(_L("Instantiate CExifRead and ignore unknown/missing tags..."));
 	read = CExifRead::NewL(*exif, CExifRead::ENoTagChecking);
+	CleanupStack::PushL(read);
 	if(!read)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(read);
 	
 	RDebug::Print(_L("Read thumbnail..."));
 	thumbnail = read->GetThumbnailL();

--- a/imagingext_pub/exif_api/tsrc/src/ExifReadTest100.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/src/ExifReadTest100.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -27,7 +27,10 @@
 	CleanupStack::PushL(exif);
 	CExifRead* read = CExifRead::NewL(*exif, CExifRead::ENoJpeg);
 	if(!read)
+	    {
+        delete read;
 		User::Leave(KErrGeneral);
+		}
 	delete read;
 	CleanupStack::PopAndDestroy(exif);
 	}

--- a/imagingext_pub/exif_api/tsrc/src/ExifReadTest200.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/src/ExifReadTest200.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -27,7 +27,10 @@
 	CleanupStack::PushL(exif);
 	CExifRead* read = CExifRead::NewL(*exif, CExifRead::ENoJpeg | CExifRead::ENoTagChecking );
 	if(!read)
+	    {
+        delete read;
 		User::Leave(KErrGeneral);
+		}
 	delete read;
 	CleanupStack::PopAndDestroy(exif);
 	}

--- a/imagingext_pub/exif_api/tsrc/src/ExifTagTest.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingext_pub/exif_api/tsrc/src/ExifTagTest.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -24,9 +24,9 @@
 	HBufC8* exif = TUtils::ReadFileL(iFs, KFullExif);
 	CleanupStack::PushL(exif);
 	CExifRead* read = CExifRead::NewL(*exif);
+	CleanupStack::PushL(read);
 	if(!read)
 		User::Leave(KErrGeneral);
-	CleanupStack::PushL(read);
 
 	const CExifTag* tag = read->GetTagL(EIfd0, KIdImageDescription);
 	CExifTag* copyTag = tag->DuplicateL();

--- a/imagingmodules/exiflib/group/ExifLib.mmp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingmodules/exiflib/group/ExifLib.mmp	Wed Oct 13 13:10:46 2010 +0300
@@ -56,4 +56,5 @@
 
 LIBRARY     euser.lib 
 
+SMPSAFE
 // End of file

--- a/imagingmodules/jp2kcodec/Group/JP2KCodec.mmp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingmodules/jp2kcodec/Group/JP2KCodec.mmp	Wed Oct 13 13:10:46 2010 +0300
@@ -69,7 +69,7 @@
 LIBRARY euser.lib
 LIBRARY fbscli.lib
 LIBRARY bafl.lib
-LIBRARY ImageConversion.lib
+LIBRARY imageconversion.lib
 
 LANG            SC
 

--- a/imagingmodules/jp2kcodec/Src/JP2KConvert.cpp	Tue Sep 14 16:30:15 2010 +0300
+++ b/imagingmodules/jp2kcodec/Src/JP2KConvert.cpp	Wed Oct 13 13:10:46 2010 +0300
@@ -28,7 +28,7 @@
 #include <barsread.h>
 #include <bautils.h>
 #include <e32math.h>
-#include <101F862D_extra.rsg>
+#include <101f862d_extra.rsg>
 #include <icl/icl_uids.hrh>
 #include "JP2KUids.hrh"
 #include <JP2KImageData.h>

--- a/layers.sysdef.xml	Tue Sep 14 16:30:15 2010 +0300
+++ b/layers.sysdef.xml	Wed Oct 13 13:10:46 2010 +0300
@@ -9,20 +9,6 @@
       <module name="imagingext">
         <unit unitID="imm.imagingext" mrp="" bldFile="&layer_real_source_path;/group" name="imagingext" />
       </module>
-
-      <module name="">
-        <unit unitID="imm.imagingext.imagingmodules.videoencpluginarm" mrp="" 
-              bldFile="&layer_real_source_path;/imagingmodules/VideoEncPluginARM/Build" 
-              filter="oem_build"
-              name="imm_imagingext_imagingmodules_videoencpluginarm" />
-      </module>
-
-      <module name="">
-        <unit unitID="imm.imagingext.imagingmodules.h264avcvideoencarm" mrp="" 
-              bldFile="&layer_real_source_path;/imagingmodules/H264AVCVideoEncARM/group"
-              filter="oem_build"
-              name="imm_imagingext_imagingmodules_h264avcvideoencarm" />
-      </module>
     </layer>
 
     <layer name="api_test_layer">