1.1 --- a/epoc32/include/ecamimageprocessing.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/ecamimageprocessing.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies).
     1.5  // All rights reserved.
     1.6  // This component and the accompanying materials are made available
     1.7 -// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
     1.8 +// under the terms of "Eclipse Public License v1.0"
     1.9  // which accompanies this distribution, and is available
    1.10 -// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
    1.11 +// at the URL "http://www.eclipse.org/legal/epl-v10.html".
    1.12  //
    1.13  // Initial Contributors:
    1.14  // Nokia Corporation - initial contribution.
    1.15 @@ -13,8 +13,6 @@
    1.16  // Description:
    1.17  //
    1.18  
    1.19 -
    1.20 -
    1.21  /**
    1.22   @file	
    1.23   @publishedAll
    1.24 @@ -29,6 +27,12 @@
    1.25  #include <ecamadvsettingsuids.hrh>
    1.26  #include <ecam/ecamconstants.h>
    1.27  
    1.28 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.29 +#include <ecamimageprocessingconst.h>
    1.30 +#include <ecamimageprocessingdef.h>
    1.31 +#endif
    1.32 +
    1.33 +
    1.34  class MCameraImageProcessing;
    1.35  class MCameraImageProcessing2;
    1.36  class MCameraImageProcessing3;
    1.37 @@ -79,32 +83,6 @@
    1.38  /** Hue adjustment  - recognized range [-100:100] */
    1.39  static const TUid  KUidECamEventtImageProcessingAdjustHue 			= {KUidECamEventtImageProcessingAdjustHueUidValue};
    1.40  static const TUid  KUidECamEventImageProcessingAdjustHue 			= {KUidECamEventtImageProcessingAdjustHueUidValue};
    1.41 -/** Contrast Enhancement
    1.42 -
    1.43 -This uid value is available from the 'supported' or 'getter' methods only to the API clients using CCamera::New2L() or 
    1.44 -CCamera::NewDuplicate2L().
    1.45 -
    1.46 -@internalTechnology
    1.47 -*/
    1.48 -static const TUid  KUidECamEventCIPAdjustContrastEnhancement 		= {KUidECamEventCIPAdjustContrastEnhancementUidValue};
    1.49 -/** Software based Red Eye Reduction
    1.50 -
    1.51 -This uid value is available from the 'supported' or 'getter' methods only to the API clients using CCamera::New2L() or 
    1.52 -CCamera::NewDuplicate2L()
    1.53 -
    1.54 -@internalTechnology
    1.55 -*/
    1.56 -static const TUid  KUidECamEventCIPAdjustRedEyeReduction 		    = {KUidECamEventCIPAdjustRedEyeReductionUidValue};
    1.57 -
    1.58 -/**
    1.59 -Image distortion correction.
    1.60 -
    1.61 -This uid value is available from the 'supported' or 'getter' methods only to the API clients using CCamera::New2L() or 
    1.62 -CCamera::NewDuplicate2L()
    1.63 -
    1.64 -@internalTechnology
    1.65 -*/
    1.66 -static const TUid KUidECamEventCIPImageDistortionCorrection         = {KUidECamEventCIPImageDistortionCorrectionUidValue};
    1.67  
    1.68  
    1.69  /** Effect value */
    1.70 @@ -125,15 +103,6 @@
    1.71  static const TUid  KUidECamEventImageProcessingNoiseReduction		= {KUidECamEventImageProcessingNoiseReductionUidValue};
    1.72  /** Glare removal */
    1.73  static const TUid  KUidECamEventImageProcessingGlareRemoval			= {KUidECamEventImageProcessingGlareRemovalUidValue};
    1.74 -/** Relative Orientation 
    1.75 -
    1.76 -This uid value is available from the 'supported' or 'getter' methods only to the API clients using CCamera::New2L() or 
    1.77 -CCamera::NewDuplicate2L().
    1.78 -
    1.79 -@publishedPartner
    1.80 -@prototype
    1.81 -*/
    1.82 -static const TUid  KUidECamEventImageProcessingTransformRelativeOrientation = {KUidECamEventImageProcessingTransformRelativeOrientationUidValue};
    1.83  
    1.84  /** Default value for image processing */
    1.85  static const TInt  KECamImageProcessingDefaultValue  = 0;
    1.86 @@ -150,16 +119,6 @@
    1.87  */
    1.88  static const TUid  KUidECamEventCIPStartColorAccent					= {KUidECamEventCIPStartColorAccentUidValue};
    1.89  
    1.90 -/**
    1.91 -Uid used to notify that the current picture orientation is unachievable after setting the relative custom orientation.
    1.92 -
    1.93 -@see CCamera::CCameraImageProcessing::SetRelativeCustomOrientationL(TOrientationReference aOrientationReference, 
    1.94 -												TRelativeCustomOrientation aRelativeCustomOrientation);
    1.95 -
    1.96 -@publishedPartner
    1.97 -@prototype
    1.98 -*/
    1.99 -static const TUid  KUidECamEventPictureOrientationUnachievable		= {KUidECamEventPictureOrientationUnachievableUidValue};
   1.100  
   1.101  /** 
   1.102  This class is used to perform image processing operations on the camera.
   1.103 @@ -729,3 +688,6 @@
   1.104  	MCameraImageProcessing3* iImpl3;   //not owned
   1.105  	};
   1.106  #endif//ECAMIMAGEPROCESSING_H
   1.107 +
   1.108 +
   1.109 +