# HG changeset patch
# User hgs
# Date 1282730288 -10800
# Node ID d8e463b04c5cfa2ae46441bcb94d602662fa94c7
# Parent  c562ea23d3d1ba48185ce2b4ffb91924bd174cbb
201028

diff -r c562ea23d3d1 -r d8e463b04c5c imageadaptationextensions/data/bld.inf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/imageadaptationextensions/data/bld.inf	Wed Aug 25 12:58:08 2010 +0300
@@ -0,0 +1,27 @@
+/*
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*
+*/
+
+
+PRJ_PLATFORMS
+DEFAULT
+
+PRJ_EXPORTS
+ImageAdaptationExtensions_stub.sis   /epoc32/data/z/system/install/ImageAdaptationExtensions_stub.sis
+
+
+//  End of File  
+
diff -r c562ea23d3d1 -r d8e463b04c5c imagingext_plat/extended_icl_jpeg_api/inc/IclExtJpegApi.h
--- a/imagingext_plat/extended_icl_jpeg_api/inc/IclExtJpegApi.h	Mon May 03 13:44:36 2010 +0300
+++ b/imagingext_plat/extended_icl_jpeg_api/inc/IclExtJpegApi.h	Wed Aug 25 12:58:08 2010 +0300
@@ -18,10 +18,10 @@
 #ifndef _ICLEXTJPEGAPI_
 #define _ICLEXTJPEGAPI_
 
-#include "ImageConversion.h"
-#include <icl/Icl_UIDS.hrh>
+#include "imageconversion.h"
+#include <icl/icl_uids.hrh>
 
-#include "ICLExifImageFrame.h"
+#include "iclexifimageframe.h"
 const TInt KMaxNumberOfPlanes = KMaxPlanesInFrame;
 const TUid KUidExtFormatJpeg = { 0 };
 const TUid KUidExtIclApiSupport = { 0 };
diff -r c562ea23d3d1 -r d8e463b04c5c imagingext_plat/jpeg2000_icl_plugin_api/inc/JP2KImageData.h
--- a/imagingext_plat/jpeg2000_icl_plugin_api/inc/JP2KImageData.h	Mon May 03 13:44:36 2010 +0300
+++ b/imagingext_plat/jpeg2000_icl_plugin_api/inc/JP2KImageData.h	Wed Aug 25 12:58:08 2010 +0300
@@ -21,7 +21,7 @@
 #define __JP2KIMAGEDATA_H__
 
 //  INCLUDES
-#include <ICL/ImageData.h>
+#include <icl/imagedata.h>
 
 // CONSTANTS
 
diff -r c562ea23d3d1 -r d8e463b04c5c package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Wed Aug 25 12:58:08 2010 +0300
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+ <package id="imagingext" name="Imaging Extensions" levels="adaptation hw-if plugin framework server app-if">
+  <collection id="imagingext_pub" name="Imaging Extensions Public Interfaces" level="app-if">
+   <component id="exif_api" name="Exif API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_pub/exif_api/exif_api.metaxml"/>
+    <unit bldFile="imagingext_pub/exif_api/group" filter="!test"/>
+    <unit bldFile="imagingext_pub/exif_api/tsrc/group"  filter="test,api_test"/>
+   </component>
+  </collection>
+  <collection id="imagingext_plat" name="Imaging Extensions Platform Interfaces" level="app-if">
+   <component id="jpeg2000_icl_plugin_api" name="JPEG2000 ICL plugin API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/jpeg2000_icl_plugin_api/jpeg2000_icl_plugin_api.metaxml"/>
+    <unit bldFile="imagingext_plat/jpeg2000_icl_plugin_api/group"/>
+   </component>
+   <component id="extended_icl_jpeg_api" name="Extended ICL Jpeg API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/extended_icl_jpeg_api/extended_icl_jpeg_api.metaxml"/>
+    <unit bldFile="imagingext_plat/extended_icl_jpeg_api/group" filter="!test"/>
+    <unit bldFile="imagingext_plat/extended_icl_jpeg_api/tsrc/group" filter="test,api_test"/>
+   </component>
+   <component id="h324_annex_k_custom_api" name="H324 Annex K Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/h324_annex_k_custom_api/h324_annex_k_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/h324_annex_k_custom_api/group"/>
+   </component>
+   <component id="ecam_orientation_custom_api" name="ECam Orientation Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/ecam_orientation_custom_api/ecam_orientation_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/ecam_orientation_custom_api/group"/>
+   </component>
+   <component id="ecam_ui_orientation_override_custom_api" name="ECam UI Orientation Override Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/ecam_ui_orientation_override_custom_api/ecam_ui_orientation_override_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/ecam_ui_orientation_override_custom_api/group"/>
+   </component>
+   <component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
+    <meta rel="Api" href="imagingext_plat/ecam_face_tracking_custom_api/ecam_face_tracking_custom_api.metaxml"/>
+    <unit bldFile="imagingext_plat/ecam_face_tracking_custom_api/group"/>
+   </component>
+   <component id="ecam_use_case_hint_custom_api" class="api" name="ECam Use Case Hint Custom API" filter="s60" introduced="^3">
+      <meta rel="Api" href="imagingext_plat/ecam_use_case_hint_custom_api/ecam_use_case_hint_custom_api.metaxml"/>
+      <unit bldFile="imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+   </component>
+  </collection>
+  <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
+   <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
+    <unit bldFile="imageadaptationextensions/iclextjpegapi/group"/>
+   </component>
+   <component id="imageadaptationextensions_data" filter="s60" name="Image Adaptation Extensions Data" class="config">
+    <unit bldFile="imageadaptationextensions/data"/>
+   </component>
+  </collection>
+  <collection id="imagingmodules" name="Imaging Modules" level="hw-if">
+   <component id="exiflib" filter="s60" name="Exif Library">
+    <unit bldFile="imagingmodules/exiflib/group"/>
+   </component>
+   <component id="jp2kcodec" filter="s60" name="JPEG2000 Decoder Plugin" class="plugin">
+    <unit bldFile="imagingmodules/jp2kcodec/group"/>
+   </component>
+  </collection>
+ </package>
+</SystemDefinition>
diff -r c562ea23d3d1 -r d8e463b04c5c package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Wed Aug 25 12:58:08 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="os"/>