# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572424 0
# Node ID a19656173f6696c6e8d74d061fd42367448a2dc0
# Parent  c2c57bf66925327d7e7df4015fded856eb4d4d7c# Parent  b8b9ec0d9e3f56c4ba81a55384b38e988ee351e5
Automatic merge from PDK_3.0.h

diff -r c2c57bf66925 -r a19656173f66 gfxtools/gditools/fontcomp/DISTRIBUTION.POLICY
--- a/gfxtools/gditools/fontcomp/DISTRIBUTION.POLICY	Mon Mar 08 21:44:25 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD:	Reference/Test	Bitmap and font conversion utilities (GDITOOLS)
diff -r c2c57bf66925 -r a19656173f66 gfxtools/gditools/fontcomp/EFF.CPP
--- a/gfxtools/gditools/fontcomp/EFF.CPP	Mon Mar 08 21:44:25 2010 +0000
+++ b/gfxtools/gditools/fontcomp/EFF.CPP	Sun Mar 14 13:13:44 2010 +0000
@@ -16,7 +16,7 @@
 */
 
 
-#include "FONTCOMP.H"
+#include "fontcomp.h"
 
 EffRead::EffRead(fstream& aFile,FontCompiler& aFontCompiler,Fxf* aFxf,short int* aMapSpace):
 	FontRead(aFile,aFontCompiler,aFxf),
diff -r c2c57bf66925 -r a19656173f66 gfxtools/gditools/fontcomp/FONTCOMP.CPP
--- a/gfxtools/gditools/fontcomp/FONTCOMP.CPP	Mon Mar 08 21:44:25 2010 +0000
+++ b/gfxtools/gditools/fontcomp/FONTCOMP.CPP	Sun Mar 14 13:13:44 2010 +0000
@@ -15,8 +15,7 @@
 *
 */
 
-
-#include "FONTCOMP.H"
+#include "fontcomp.h"
 
 FontCompiler::FontCompiler():
 	iInputFile(),
@@ -40,7 +39,7 @@
 #ifdef __MSVCDOTNET__
 		fstream tempfile(mapfile, ios::in | ios::binary);
 #else //!__MSVCDOTNET__
-		fstream tempfile(mapfile, ios::in | ios::binary | ios::nocreate);
+		fstream tempfile(mapfile, ios::in | ios::binary);
 #endif //__MSVCDOTNET__
 
 		if(!tempfile.is_open())
@@ -53,7 +52,7 @@
 #ifdef __MSVCDOTNET__
 	iInputFile.open(infile, ios::in | ios::binary);
 #else //!__MSVCDOTNET__
-	iInputFile.open(infile, ios::in | ios::binary | ios::nocreate);
+	iInputFile.open(infile, ios::in | ios::binary);
 #endif //__MSVCDOTNET__
 
 	if(!(iOutputFile.is_open() && iInputFile.is_open()))
@@ -150,7 +149,7 @@
 			    bit>>=1;
 			    if (bit==0)
 				{
-				bit=unsigned char(0x80);
+				bit= (unsigned char)0x80;
 				pb--;
 				}
 			    }
diff -r c2c57bf66925 -r a19656173f66 gfxtools/gditools/fontcomp/FONTCOMP.H
--- a/gfxtools/gditools/fontcomp/FONTCOMP.H	Mon Mar 08 21:44:25 2010 +0000
+++ b/gfxtools/gditools/fontcomp/FONTCOMP.H	Sun Mar 14 13:13:44 2010 +0000
@@ -20,7 +20,7 @@
 #define __FONTCOMP_H__
 #include <stdlib.h>
 #include <string.h>
-#include <io.h>
+#include <stdio.h>
 
 #ifdef __MSVCDOTNET__
 #include <fstream>
diff -r c2c57bf66925 -r a19656173f66 gfxtools/gditools/fontcomp/FSC.CPP
--- a/gfxtools/gditools/fontcomp/FSC.CPP	Mon Mar 08 21:44:25 2010 +0000
+++ b/gfxtools/gditools/fontcomp/FSC.CPP	Sun Mar 14 13:13:44 2010 +0000
@@ -16,7 +16,7 @@
 */
 
 
-#include "FONTCOMP.H"
+#include "fontcomp.h"
 
 FscRead::FscRead(fstream& aFile,FontCompiler& aFontCompiler,Fxf* aFxf):
 	FontRead(aFile,aFontCompiler,aFxf)
diff -r c2c57bf66925 -r a19656173f66 gfxtools/gditools/fontcomp/GDSFCOMP.CPP
--- a/gfxtools/gditools/fontcomp/GDSFCOMP.CPP	Mon Mar 08 21:44:25 2010 +0000
+++ b/gfxtools/gditools/fontcomp/GDSFCOMP.CPP	Sun Mar 14 13:13:44 2010 +0000
@@ -16,8 +16,10 @@
 */
 
 
-#include "GDSFCOMP.H"
-#include "TOOLSVER.H"
+#include "gdsfcomp.h"
+#include "toolsver.h"
+
+#include <sstream>
 
 int GdsFontCompiler::WriteFont()
 	{
@@ -155,7 +157,7 @@
 		WriteFormattedData(buf,1);
 	}
 
-void GdsFontCompiler::WriteFormattedData(char* aData,int aNewLine)
+void GdsFontCompiler::WriteFormattedData(const char* aData,int aNewLine)
 	{
 	if(aData)
 		iOutputFile << aData;
@@ -165,9 +167,11 @@
 
 void GdsFontCompiler::WriteFormattedData(int aNum,int aNewLine)
 	{
-	char numbuf[16];
-	_itoa(aNum,numbuf,10);
-	WriteFormattedData(numbuf,aNewLine);
+    std::stringstream ss;
+
+    ss << aNum;
+
+	WriteFormattedData(ss.str().c_str(), aNewLine);
 	}
 
 void GdsFontCompiler::WriteNewLine()
diff -r c2c57bf66925 -r a19656173f66 gfxtools/gditools/fontcomp/GDSFCOMP.H
--- a/gfxtools/gditools/fontcomp/GDSFCOMP.H	Mon Mar 08 21:44:25 2010 +0000
+++ b/gfxtools/gditools/fontcomp/GDSFCOMP.H	Sun Mar 14 13:13:44 2010 +0000
@@ -19,7 +19,7 @@
 #if !defined(__GDSFCOMP_H__)
 #define __GDSFCOMP_H__
 #if !defined(__FONTCOMP_H__)
-#include "FONTCOMP.H"
+#include "fontcomp.h"
 #endif
 /**
 @internalComponent
@@ -39,7 +39,7 @@
 	void WriteFooter();
 	void WriteCharData(int);
 	void WriteBlankLines(int,int);
-	void WriteFormattedData(char*,int=0);
+	void WriteFormattedData(const char*,int=0);
 	void WriteFormattedData(int,int=0);
 	void WriteNewLine();
 	};
diff -r c2c57bf66925 -r a19656173f66 gfxtools/gditools/group/FONTCOMP.MMP
--- a/gfxtools/gditools/group/FONTCOMP.MMP	Mon Mar 08 21:44:25 2010 +0000
+++ b/gfxtools/gditools/group/FONTCOMP.MMP	Sun Mar 14 13:13:44 2010 +0000
@@ -22,6 +22,7 @@
 TARGETTYPE       exe
 
 USERINCLUDE   ../inc
+USERINCLUDE   ../fontcomp
 USERINCLUDE ../../../inc
 USERINCLUDE ../../inc
 
diff -r c2c57bf66925 -r a19656173f66 gfxtools/gditools/group/bld.inf
--- a/gfxtools/gditools/group/bld.inf	Mon Mar 08 21:44:25 2010 +0000
+++ b/gfxtools/gditools/group/bld.inf	Sun Mar 14 13:13:44 2010 +0000
@@ -25,18 +25,22 @@
 
 PRJ_PLATFORMS
 
-TOOLS
+TOOLS TOOLS2
 
 
 PRJ_EXPORTS
 
 ../group/fontcomp.ipr    /epoc32/engdoc/tools/fontcomp.ipr
 
+// IBY-files
+../rom/gdi.iby	CORE_IBY_EXPORT_PATH(tools,gdi.iby)
+
+
 PRJ_MMPFILES
 
-#ifdef TOOLS
+#if (defined TOOLS ) || (defined TOOLS2)
 
-../group/FONTCOMP.MMP
+../group/fontcomp.mmp
 
 // NOTICE! Bmconv is moved to /s60/tools/platformtools/gfxtools/bmconv/group
 
diff -r c2c57bf66925 -r a19656173f66 svgtencoder/svgtenc/standalone/lib/SVGTBinEncode.exe
Binary file svgtencoder/svgtenc/standalone/lib/SVGTBinEncode.exe has changed
diff -r c2c57bf66925 -r a19656173f66 svgtencoder/svgtenc/standalone/lib/SYMDEFCPPDLL.dll
Binary file svgtencoder/svgtenc/standalone/lib/SYMDEFCPPDLL.dll has changed