1.1 --- a/epoc32/include/icl/imagecodec.h	Wed Mar 31 12:27:01 2010 +0100
     1.2 +++ b/epoc32/include/icl/imagecodec.h	Wed Mar 31 12:33:34 2010 +0100
     1.3 @@ -1,9 +1,9 @@
     1.4  // Copyright (c) 2002-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 @@ -19,6 +19,10 @@
    1.16  #include <e32std.h>
    1.17  #include <fbs.h>
    1.18  
    1.19 +#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
    1.20 +#include <icl/imagecodecdef.h>
    1.21 +#endif
    1.22 +
    1.23  // Pre-definitions needed to make sure everything always defined in the right order
    1.24  class TFrameInfo;
    1.25  class TImageDataBlock;
    1.26 @@ -56,55 +60,6 @@
    1.27  	};
    1.28  
    1.29  /**
    1.30 -@internalComponent
    1.31 -
    1.32 -
    1.33 -Class used to shadow the descriptor supplying the image data.
    1.34 -
    1.35 -It maintains a flag to determine whether the descriptor contains a
    1.36 -filename or the image data itself.
    1.37 -
    1.38 -This class is not intended for public use.
    1.39 -*/
    1.40 -class TImageParameterData
    1.41 -	{
    1.42 -public:
    1.43 -
    1.44 -	/**
    1.45 -	Flag used to determine what the descriptor contains.
    1.46 -	*/
    1.47 -	enum TImageParameterDataFlag
    1.48 -		{
    1.49 -		/** Field not set.
    1.50 -		*/
    1.51 -		ENull		= 0x00000000,
    1.52 -
    1.53 -		/** Descriptor is a filename.
    1.54 -		*/
    1.55 -		EFilename	= 0x00000001,
    1.56 -
    1.57 -		/** Descriptor contains data.
    1.58 -		*/
    1.59 -		EData		= 0x00000002
    1.60 -		};
    1.61 -
    1.62 -	TImageParameterData();
    1.63 -	void SetFilenamePtr(const TDesC* aSourceFilenamePtr);
    1.64 -	void SetDataPtr(const TDesC8* aSourceDataPtr);
    1.65 -	IMPORT_C TBool IsFilename() const;
    1.66 -	IMPORT_C const TDesC* SourceFilenamePtr() const;
    1.67 -	IMPORT_C const TDesC8* SourceDataPtr() const;
    1.68 -
    1.69 -private:
    1.70 -	TImageParameterDataFlag iImageParameterDataFlag;
    1.71 -	union
    1.72 -		{
    1.73 -		const TDesC* iSourceFilenamePtr;
    1.74 -		const TDesC8* iSourceDataPtr;
    1.75 -		};
    1.76 -	};
    1.77 -
    1.78 -/**
    1.79  @publishedAll
    1.80  @released
    1.81  
    1.82 @@ -360,6 +315,7 @@
    1.83  @publishedAll
    1.84  @released
    1.85  
    1.86 +
    1.87  Provides functions to determine or set features of the codec's CImageProcessor plus
    1.88  provide extra functionality for Framework Extensions.
    1.89