diff -r c7c26511138f -r 360bd6b35136 imgtools/imglib/host/h_file.cpp
--- a/imgtools/imglib/host/h_file.cpp	Wed Jun 16 16:51:40 2010 +0300
+++ b/imgtools/imglib/host/h_file.cpp	Wed Jun 23 16:56:47 2010 +0800
@@ -1,150 +1,150 @@
-/*
-* Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of the License "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: 
-*
-*/
-
-
-#ifdef __LINUX__
-#include <unistd.h>
-#else	// Windows specific
-#include <io.h>
-#endif
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-
-#include "h_utl.h"
-
-TInt HFile::Open(const TText * const aFileName, TInt32 * const aFileHandle)
-	{
-#ifdef __LINUX__
-	TInt32 hFile = open((const char *)aFileName, O_RDONLY );
-#else
-	TInt32 hFile = _open((const char *)aFileName, _O_RDONLY | _O_BINARY);
-#endif
-
-	if (hFile == -1)
-		{
-		switch (errno)
-			{
-		case EACCES:
-			Print(EError,"Can't open file %s - access violation.\n",aFileName);
-			break;
-		case EEXIST:
-			Print(EAlways,"Tried to create existing file %s\n",aFileName);
-			break;
-		case EINVAL:
-			Print(EError,"Can't open file %s - invalid open flags.\n",aFileName);
-			break;
-		case EMFILE:
-			Print(EError,"Can't open file %s - too many open files.\n",aFileName);
-			break;
-		case ENOENT:
-			Print(EError,"Can't open file %s - file or path not found.\n",aFileName);
-			break;
-		default:
-			Print(EError,"Can't open file %s, error %d (decimal).\n",aFileName,errno);
-			break;
-			}
-		return errno;
-		}
- 	*aFileHandle = hFile;
-	return 0;
-	}	
-
-/******************************************************************************/
-TBool HFile::Read(const TInt32 aFileHandle, TAny * const aBuffer, const TUint32 aCount)
-	{
-	TInt32 bytesRead =  _read(aFileHandle, aBuffer, aCount);
-	if (bytesRead != (TInt32)aCount)
-		return EFalse;
-	else
-		return ETrue;
-	}  
-
-/******************************************************************************/
-TBool HFile::Seek(const TInt32 aFileHandle, const TUint32 aOffset)
-	{
-	TInt32 newPos = _lseek(aFileHandle, aOffset, SEEK_SET);
-	if (newPos == -1)
-		return(EFalse);
-	else
-		return ETrue;
-	}
-
-/******************************************************************************/
-TUint32 HFile::GetPos(const TInt32 aFileHandle)
-	{
-	TUint32 pos = _lseek(aFileHandle, 0, SEEK_CUR);
-	return pos;
-	}
-
-/******************************************************************************/
-TUint32 HFile::GetLength(TText *aName)
-	{
-	TInt32 handle;
-	if (HFile::Open(aName, &handle)==0)
-		{
-		TUint32 size = _filelength(handle);
-		HFile::Close(handle);
-		return size;
-		}
-	else
-		return 0;
-	}
-
-/******************************************************************************/
-TUint32 HFile::GetLength(const TInt32 aFileHandle)
-	{
-
-	TUint32 size = _filelength(aFileHandle);
-	return size;
-	}
-
-
-/******************************************************************************/
-void HFile::Close(const TInt32 aFileHandle)
-	{
-	_close(aFileHandle);
-	}
-
-
-/******************************************************************************/
-TUint32 HFile::Read(TText *aName, TAny *someMem)
- 	{
-	TInt32 handle;
-	if (HFile::Open(aName, &handle)==0)
-		{
-		TUint32 size = HFile::GetLength(handle);
-		if (HFile::Read(handle, someMem, size))
-			{
-			HFile::Close(handle);
-			return size;
-			}
-		else 
-			{
-			HFile::Close(handle);
-			return 0;
-			}
-		}
-	else
-		return 0;
-	}
-
-
-/******************************************************************************/
+/*
+* Copyright (c) 1995-2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "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: 
+*
+*/
+
+
+#ifdef __LINUX__
+#include <unistd.h>
+#else	// Windows specific
+#include <io.h>
+#endif
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+
+#include "h_utl.h"
+
+TInt HFile::Open(const char* aFileName, TInt32 * const aFileHandle)
+	{
+#ifdef __LINUX__
+	TInt32 hFile = open(aFileName, O_RDONLY );
+#else
+	TInt32 hFile = _open(aFileName, _O_RDONLY | _O_BINARY);
+#endif
+
+	if (hFile == -1)
+		{
+		switch (errno)
+			{
+		case EACCES:
+			Print(EError,"Can't open file %s - access violation.\n",aFileName);
+			break;
+		case EEXIST:
+			Print(EAlways,"Tried to create existing file %s\n",aFileName);
+			break;
+		case EINVAL:
+			Print(EError,"Can't open file %s - invalid open flags.\n",aFileName);
+			break;
+		case EMFILE:
+			Print(EError,"Can't open file %s - too many open files.\n",aFileName);
+			break;
+		case ENOENT:
+			Print(EError,"Can't open file %s - file or path not found.\n",aFileName);
+			break;
+		default:
+			Print(EError,"Can't open file %s, error %d (decimal).\n",aFileName,errno);
+			break;
+			}
+		return errno;
+		}
+ 	*aFileHandle = hFile;
+	return 0;
+	}	
+
+/******************************************************************************/
+TBool HFile::Read(const TInt32 aFileHandle, TAny * const aBuffer, const TUint32 aCount)
+	{
+	TInt32 bytesRead =  _read(aFileHandle, aBuffer, aCount);
+	if (bytesRead != (TInt32)aCount)
+		return EFalse;
+	else
+		return ETrue;
+	}  
+
+/******************************************************************************/
+TBool HFile::Seek(const TInt32 aFileHandle, const TUint32 aOffset)
+	{
+	TInt32 newPos = _lseek(aFileHandle, aOffset, SEEK_SET);
+	if (newPos == -1)
+		return(EFalse);
+	else
+		return ETrue;
+	}
+
+/******************************************************************************/
+TUint32 HFile::GetPos(const TInt32 aFileHandle)
+	{
+	TUint32 pos = _lseek(aFileHandle, 0, SEEK_CUR);
+	return pos;
+	}
+
+/******************************************************************************/
+TUint32 HFile::GetLength(const char* aName)
+	{
+	TInt32 handle;
+	if (HFile::Open(aName, &handle)==0)
+		{
+		TUint32 size = _filelength(handle);
+		HFile::Close(handle);
+		return size;
+		}
+	else
+		return 0;
+	}
+
+/******************************************************************************/
+TUint32 HFile::GetLength(const TInt32 aFileHandle)
+	{
+
+	TUint32 size = _filelength(aFileHandle);
+	return size;
+	}
+
+
+/******************************************************************************/
+void HFile::Close(const TInt32 aFileHandle)
+	{
+	_close(aFileHandle);
+	}
+
+
+/******************************************************************************/
+TUint32 HFile::Read(const char* aName, TAny *someMem)
+ 	{
+	TInt32 handle;
+	if (HFile::Open(aName, &handle)==0)
+		{
+		TUint32 size = HFile::GetLength(handle);
+		if (HFile::Read(handle, someMem, size))
+			{
+			HFile::Close(handle);
+			return size;
+			}
+		else 
+			{
+			HFile::Close(handle);
+			return 0;
+			}
+		}
+	else
+		return 0;
+	}
+
+
+/******************************************************************************/