diff -r ae690a8c4a18 -r f7bf1ed8db72 imagingandcamerafws/imaginginttest/imageencoder/group/tsi_icl_imageencoder.pkg
--- a/imagingandcamerafws/imaginginttest/imageencoder/group/tsi_icl_imageencoder.pkg	Fri Jul 09 13:09:11 2010 +0100
+++ b/imagingandcamerafws/imaginginttest/imageencoder/group/tsi_icl_imageencoder.pkg	Mon Aug 23 18:56:36 2010 +0100
@@ -51,6 +51,35 @@
 "\sf\os\mm\imagingandcamerafws\imaginginttest\data\testimages\mbm\bitmap_restartinterop.mbm"-"c:\icl\testimages\mbm\bitmap_restartinterop.mbm"
 
 //mm_testdata
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small10.jpg"-"c:\icl\testimages\jpeg\jpeg_small10.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small08.jpg"-"c:\icl\testimages\jpeg\jpeg_small08.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_multiscan.jpg"-"c:\icl\testimages\jpeg\jpeg_multiscan.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_multiscan_a.jpg"-"c:\icl\testimages\jpeg\jpeg_multiscan_a.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_multiscan_b.jpg"-"c:\icl\testimages\jpeg\jpeg_multiscan_b.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_multiscan_c.jpg"-"c:\icl\testimages\jpeg\jpeg_multiscan_c.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_multiscan_d.jpg"-"c:\icl\testimages\jpeg\jpeg_multiscan_d.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18.jpg"-"c:\icl\testimages\jpeg\jpeg_small18.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_a.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_a.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_b.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_b.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_c.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_c.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_d.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_d.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_e.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_e.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_f.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_f.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_g.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_g.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_h.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_h.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_i.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_i.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small18_j.jpg"-"c:\icl\testimages\jpeg\jpeg_small18_j.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small14_a.jpg"-"c:\icl\testimages\jpeg\jpeg_small14_a.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small10_a.jpg"-"c:\icl\testimages\jpeg\jpeg_small10_a.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_wideandthin02.jpg"-"c:\icl\testimages\jpeg\jpeg_wideandthin02.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_wideandthin03.jpg"-"c:\icl\testimages\jpeg\jpeg_wideandthin03.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_wideandthin17.jpg"-"c:\icl\testimages\jpeg\jpeg_wideandthin17.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_supersize01.jpg"-"c:\icl\testimages\jpeg\jpeg_supersize01.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small09_a.jpg"-"c:\icl\testimages\jpeg\jpeg_small09_a.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small15.jpg"-"c:\icl\testimages\jpeg\jpeg_small15.jpg"
+"\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\testimages\jpeg\jpeg_small13_a.jpg"-"c:\icl\testimages\jpeg\jpeg_small13_a.jpg"
+
+
 "\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\refimages\jpeg\bitmap_avg01_refperf30.jpg"-"c:\icl\refimages\jpeg\bitmap_avg01_refperf30.jpg"
 "\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\refimages\jpeg\bitmap_avg01_refperf620.jpg"-"c:\icl\refimages\jpeg\bitmap_avg01_refperf620.jpg"
 "\sf\os\mm_testdata\mm_testimagedata\sf\os\mm\imagingandcamerafws\imagingfws\test\excludedfiles\inttest\icl\data\refimages\jpeg\bitmap_avg01_refperf650.jpg"-"c:\icl\refimages\jpeg\bitmap_avg01_refperf650.jpg"