--- a/charconvfw/Charconv/ongoing/EABI/distribution.policy Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
\ No newline at end of file
--- a/charconvfw/Charconv/ongoing/Group/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/Include/CHARCONV_TLS.H Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/Charconv/ongoing/Include/CHARCONV_TLS.H Tue May 25 14:39:28 2010 +0300
@@ -26,7 +26,7 @@
#define __CHARCONV_TLS_H__
#if !defined(__E32STD_H__)
-#include <E32STD.H>
+#include <e32std.h>
#endif
#if !defined(__E32BASE_H__)
--- a/charconvfw/Charconv/ongoing/Include/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/Include/JISBASE.H Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/Charconv/ongoing/Include/JISBASE.H Tue May 25 14:39:28 2010 +0300
@@ -26,7 +26,7 @@
#define __JISBASE_H__
#if !defined(__E32STD_H__)
-#include <E32STD.H>
+#include <e32std.h>
#endif
#if !defined(__CHARCONV_H__)
--- a/charconvfw/Charconv/ongoing/Include/SHIFTJIS2.H Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/Charconv/ongoing/Include/SHIFTJIS2.H Tue May 25 14:39:28 2010 +0300
@@ -26,7 +26,7 @@
#define __SHIFTJIS_H__
#if !defined(__E32STD_H__)
-#include <E32STD.H>
+#include <e32std.h>
#endif
#if !defined(__CHARCONV_H__)
--- a/charconvfw/Charconv/ongoing/Include/UCS2.H Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/Charconv/ongoing/Include/UCS2.H Tue May 25 14:39:28 2010 +0300
@@ -26,7 +26,7 @@
#define __UCS2_H__
#if !defined(__E32STD_H__)
-#include <E32STD.H>
+#include <e32std.h>
#endif
#if !defined(__CHARCONV_H__)
--- a/charconvfw/Charconv/ongoing/Source/foreign/builtin/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/Source/foreign/plugins/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/Source/foreign/shared/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/Source/main/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/Source/names/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/Source/tool/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/Source/utf/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/Source/utils/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/bmarm/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/bwins/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/data/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/data/snm/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/test/data/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/test/data/main/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/test/data/tool/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/test/data/utf/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/test/source/main/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/test/source/main/TISO8859X.H Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/Charconv/ongoing/test/source/main/TISO8859X.H Tue May 25 14:39:28 2010 +0300
@@ -26,7 +26,7 @@
#define __TISO8859X_H__
#if !defined(__E32STD_H__)
-#include <E32STD.H>
+#include <e32std.h>
#endif
struct STstIso8859TestDataItem
--- a/charconvfw/Charconv/ongoing/test/source/main/TISO8859X_GENERATE_CPP.PL Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/Charconv/ongoing/test/source/main/TISO8859X_GENERATE_CPP.PL Tue May 25 14:39:28 2010 +0300
@@ -43,7 +43,7 @@
my $outputFileName='G_TISO8859X.CPP';
open(OUTPUT_FILE, "> ..\\test\\source\\main\\$outputFileName") or die; # we're currently standing in charconv\data and we want the generated file to go into charconv\test\source\main
print(OUTPUT_FILE "// $outputFileName\n//\n// Copyright (c) ".(1900+(gmtime(time))[5])." Symbian Ltd. All rights reserved.\n//\n\n");
-print(OUTPUT_FILE "#include <E32STD.H>\n#include <CHARCONV.H>\n#include \"TISO8859X.H\"\n\n");
+print(OUTPUT_FILE "#include <e32std.h>\n#include <CHARCONV.H>\n#include \"TISO8859X.H\"\n\n");
my $numberOfItems=@iso8859TestData;
my $i;
for ($i=0; $i<$numberOfItems; ++$i)
--- a/charconvfw/Charconv/ongoing/test/source/plugins/Distribution.Policy Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/test/source/utf/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconv/ongoing/test/tool/DISTRIBUTION.POLICY Tue May 11 17:53:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category E
-OSD: Optional Replaceable Character Encoding Conversion
--- a/charconvfw/Charconvplugin/inc/cp949table.h Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/Charconvplugin/inc/cp949table.h Tue May 25 14:39:28 2010 +0300
@@ -19,7 +19,7 @@
#define __CP949TABLE_H__
#if !defined(__E32STD_H__)
-#include <E32STD.H>
+#include <e32std.h>
#endif
#if !defined(__CHARCONV_H__)
--- a/charconvfw/charconv_fw/group/bld.inf Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconv_fw/group/bld.inf Tue May 25 14:39:28 2010 +0300
@@ -23,7 +23,7 @@
PRJ_PLATFORMS
- DEFAULT WINC TOOLS
+ DEFAULT WINC TOOLS TOOLS2
PRJ_EXPORTS
@@ -50,7 +50,7 @@
PRJ_MMPFILES
-#if defined(TOOLS)
+#if defined(TOOLS) || defined(TOOLS2)
convtool.mmp
--- a/charconvfw/charconv_fw/tools/convtool/convtool.cpp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconv_fw/tools/convtool/convtool.cpp Tue May 25 14:39:28 2010 +0300
@@ -30,6 +30,14 @@
#undef BIG_ENDIAN
+#if (defined(__MSVCRT__) || defined(_MSC_VER))
+//#define _stricmp _stricmp
+//#define _strnicmp _strnicmp
+#else // linux
+#define _stricmp strcasecmp
+#define _strnicmp strncasecmp
+#endif
+
const int KVersionNumber=025;
const int KLargeNumber=1000000;
@@ -346,7 +354,7 @@
}
}
-void main(int aArgc, char* aArgv[])
+int main(int aArgc, char* aArgv[])
{
int outputByteOrderMark=0;
TByteOrder unicodeByteOrder=EByteOrderUnspecified;
@@ -362,6 +370,6 @@
HandleByteOrderMarks(outputByteOrderMark, unicodeByteOrder, inputEncoding, outputEncoding, inputFile, outputFile);
DoConversion(unicodeByteOrder, inputEncoding, outputEncoding, inputFile, outputFile);
FlushAndCloseFiles(inputFile, outputFile);
- exit(0);
+ return 0;
}
--- a/charconvfw/charconvplugins/group/EUCKR.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/EUCKR.mmp Tue May 25 14:39:28 2010 +0300
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource EUCKR.RSS
+Start resource EUCKR.rss
Targetpath /resource/charconv
End
start resource 2000E527.rss
-target EUCKR.RSC
+target euckr.rsc
end
SMPSAFE
--- a/charconvfw/charconvplugins/group/EucJpDirectmap.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/EucJpDirectmap.mmp Tue May 25 14:39:28 2010 +0300
@@ -57,7 +57,7 @@
End
start resource 10207353.rss
-target EucJpDirectmap.RSC
+target eucjpdirectmap.rsc
end
SMPSAFE
--- a/charconvfw/charconvplugins/group/KOI8R.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/KOI8R.mmp Tue May 25 14:39:28 2010 +0300
@@ -25,9 +25,9 @@
VENDORID 0x70000001
SOURCEPATH ../src/plugins
-SOURCE KOI8R.CPP
+SOURCE KOI8R.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_KOI8R.CPP
+SOURCE g_KOI8R.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource KOI8R.RSS
+Start resource KOI8R.rss
Targetpath /resource/charconv
End
start resource 10207401.rss
-target KOI8R.RSC
+target koi8r.rsc
end
--- a/charconvfw/charconvplugins/group/KOI8U.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/KOI8U.mmp Tue May 25 14:39:28 2010 +0300
@@ -24,9 +24,9 @@
uid 0x10009D8D 0x10207402
SOURCEPATH ../src/plugins
-SOURCE KOI8U.CPP
+SOURCE KOI8U.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_KOI8U.CPP
+SOURCE g_KOI8U.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -36,12 +36,12 @@
LIBRARY ecom.lib
SOURCEPATH ../resource
-Start resource KOI8U.RSS
+Start resource KOI8U.rss
Targetpath /resource/charconv
End
start resource 10207402.rss
-target KOI8U.RSC
+target koi8u.rsc
end
SMPSAFE
--- a/charconvfw/charconvplugins/group/ShiftJisDirectmap.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/ShiftJisDirectmap.mmp Tue May 25 14:39:28 2010 +0300
@@ -37,7 +37,7 @@
USERINCLUDE ../src/inc
USERINCLUDE ../src/shared
-source ShiftJisDirectmap.CPP
+source ShiftJisDirectmap.cpp
LIBRARY euser.lib
LIBRARY charconv.lib
@@ -55,7 +55,7 @@
End
start resource 10207354.rss
-target ShiftJisDirectmap.RSC
+target shiftjisdirectmap.rsc
end
SMPSAFE
--- a/charconvfw/charconvplugins/group/TIS_620.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/TIS_620.mmp Tue May 25 14:39:28 2010 +0300
@@ -17,7 +17,7 @@
*/
-TARGET TIS_620.DLL
+TARGET TIS_620.dll
TARGETTYPE PLUGIN
CAPABILITY All -Tcb
@@ -27,7 +27,7 @@
SOURCEPATH ../src/plugins
SOURCE TIS_620.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_TIS_620.cpp
+SOURCE g_TIS_620.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -37,12 +37,12 @@
LIBRARY ecom.lib
SOURCEPATH ../resource
-Start resource TIS_620.RSS
+Start resource TIS_620.rss
Targetpath /resource/charconv
End
start resource 10207403.rss
-target TIS_620.RSC
+target tis_620.rsc
end
--- a/charconvfw/charconvplugins/group/Win1250.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/Win1250.mmp Tue May 25 14:39:28 2010 +0300
@@ -25,9 +25,9 @@
VENDORID 0x70000001
SOURCEPATH ../src/plugins
-SOURCE Win1250.CPP
+SOURCE Win1250.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_Win1250.CPP
+SOURCE g_win1250.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource win1250.RSS
+Start resource win1250.rss
Targetpath /resource/charconv
End
start resource 10207404.rss
-target win1250.RSC
+target win1250.rsc
end
--- a/charconvfw/charconvplugins/group/Win1251.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/Win1251.mmp Tue May 25 14:39:28 2010 +0300
@@ -25,9 +25,9 @@
VENDORID 0x70000001
SOURCEPATH ../src/plugins
-SOURCE Win1251.CPP
+SOURCE Win1251.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_Win1251.CPP
+SOURCE g_win1251.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource WIN1251.RSS
+Start resource Win1251.rss
Targetpath /resource/charconv
End
start resource 10207405.rss
-target WIN1251.RSC
+target win1251.rsc
end
SMPSAFE
--- a/charconvfw/charconvplugins/group/Win1253.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/Win1253.mmp Tue May 25 14:39:28 2010 +0300
@@ -25,9 +25,9 @@
VENDORID 0x70000001
SOURCEPATH ../src/plugins
-SOURCE Win1253.CPP
+SOURCE Win1253.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_Win1253.CPP
+SOURCE g_win1253.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource WIN1253.RSS
+Start resource Win1253.rss
Targetpath /resource/charconv
End
start resource 10207407.rss
-target WIN1253.RSC
+target win1253.rsc
end
--- a/charconvfw/charconvplugins/group/Win1254.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/Win1254.mmp Tue May 25 14:39:28 2010 +0300
@@ -25,9 +25,9 @@
VENDORID 0x70000001
SOURCEPATH ../src/plugins
-SOURCE Win1254.CPP
+SOURCE Win1254.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_Win1254.CPP
+SOURCE g_win1254.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource WIN1254.RSS
+Start resource Win1254.rss
Targetpath /resource/charconv
End
start resource 10207408.rss
-target WIN1254.RSC
+target win1254.rsc
end
--- a/charconvfw/charconvplugins/group/Win1255.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/Win1255.mmp Tue May 25 14:39:28 2010 +0300
@@ -25,9 +25,9 @@
VENDORID 0x70000001
SOURCEPATH ../src/plugins
-SOURCE Win1255.CPP
+SOURCE Win1255.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_Win1255.CPP
+SOURCE g_win1255.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource WIN1255.RSS
+Start resource Win1255.rss
Targetpath /resource/charconv
End
start resource 10207409.rss
-target WIN1255.RSC
+target win1255.rsc
end
--- a/charconvfw/charconvplugins/group/Win1256.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/Win1256.mmp Tue May 25 14:39:28 2010 +0300
@@ -25,9 +25,9 @@
VENDORID 0x70000001
SOURCEPATH ../src/plugins
-SOURCE Win1256.CPP
+SOURCE Win1256.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_WIN1256.CPP
+SOURCE g_win1256.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource WIN1256.RSS
+Start resource Win1256.rss
Targetpath /resource/charconv
End
start resource 1020740A.rss
-target WIN1256.RSC
+target win1256.rsc
end
SMPSAFE
--- a/charconvfw/charconvplugins/group/Win1257.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/Win1257.mmp Tue May 25 14:39:28 2010 +0300
@@ -25,9 +25,9 @@
VENDORID 0x70000001
SOURCEPATH ../src/plugins
-SOURCE Win1257.CPP
+SOURCE Win1257.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_Win1257.CPP
+SOURCE g_win1257.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource WIN1257.RSS
+Start resource Win1257.rss
Targetpath /resource/charconv
End
start resource 1020740B.rss
-target WIN1257.RSC
+target win1257.rsc
end
--- a/charconvfw/charconvplugins/group/Win1258.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/Win1258.mmp Tue May 25 14:39:28 2010 +0300
@@ -25,9 +25,9 @@
VENDORID 0x70000001
SOURCEPATH ../src/plugins
-SOURCE Win1258.CPP
+SOURCE Win1258.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_Win1258.CPP
+SOURCE g_win1258.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource WIN1258.RSS
+Start resource Win1258.rss
Targetpath /resource/charconv
End
start resource 1020740C.rss
-target WIN1258.RSC
+target win1258.rsc
end
SMPSAFE
--- a/charconvfw/charconvplugins/group/Win874.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/Win874.mmp Tue May 25 14:39:28 2010 +0300
@@ -25,9 +25,9 @@
VENDORID 0x70000001
SOURCEPATH ../src/plugins
-SOURCE Win874.CPP
+SOURCE Win874.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_WIN874.CPP
+SOURCE g_win874.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource Win874.RSS
+Start resource Win874.rss
Targetpath /resource/charconv
End
start resource 1020740D.rss
-target Win874.RSC
+target win874.rsc
end
--- a/charconvfw/charconvplugins/group/Win949.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/Win949.mmp Tue May 25 14:39:28 2010 +0300
@@ -36,12 +36,12 @@
LIBRARY CP949table.lib
SOURCEPATH ../resource
-Start resource win949.RSS
+Start resource win949.rss
Targetpath /resource/charconv
End
start resource 20010100.rss
-target win949.RSC
+target win949.rsc
end
--- a/charconvfw/charconvplugins/group/eucjp_packed_2.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/eucjp_packed_2.mmp Tue May 25 14:39:28 2010 +0300
@@ -33,7 +33,7 @@
USERINCLUDE ../src/shared
USERINCLUDE ../inc
SOURCEPATH ../src/plugins
-SOURCE eucjp_packed_2.cpp
+SOURCE EUCJP_PACKED_2.CPP
SOURCEPATH ../resource
START RESOURCE eucjp_packed.rss
--- a/charconvfw/charconvplugins/group/iscii.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/iscii.mmp Tue May 25 14:39:28 2010 +0300
@@ -25,9 +25,9 @@
VENDORID 0x70000001
SOURCEPATH ../src/plugins
-SOURCE iscii.CPP
+SOURCE iscii.cpp
SOURCEPATH /epoc32/build/generatedcpp/charconv
-SOURCE G_iscii.CPP
+SOURCE g_iscii.cpp
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../inc
@@ -39,12 +39,12 @@
SOURCEPATH ../resource
-Start resource iscii.RSS
+Start resource iscii.rss
Targetpath /resource/charconv
End
start resource 1027508D.rss
-target iscii.RSC
+target iscii.rsc
end
SMPSAFE
--- a/charconvfw/charconvplugins/group/iso2022jp1_2.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/iso2022jp1_2.mmp Tue May 25 14:39:28 2010 +0300
@@ -36,7 +36,7 @@
USERINCLUDE ../src/shared
SOURCEPATH ../src/plugins
-SOURCE iso2022jp1_2.cpp
+SOURCE ISO2022JP1_2.CPP
SOURCEPATH ../resource
START RESOURCE iso2022jp1.rss
--- a/charconvfw/charconvplugins/group/iso2022jp_2.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/iso2022jp_2.mmp Tue May 25 14:39:28 2010 +0300
@@ -36,7 +36,7 @@
USERINCLUDE ../src/shared
SOURCEPATH ../src/plugins
-SOURCE iso2022jp_2.cpp
+SOURCE ISO2022JP_2.CPP
SOURCEPATH ../resource
START RESOURCE iso2022jp.rss
--- a/charconvfw/charconvplugins/group/iso2022kr.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/iso2022kr.mmp Tue May 25 14:39:28 2010 +0300
@@ -38,12 +38,12 @@
SOURCEPATH ../resource
-Start resource iso2022kr.RSS
+Start resource iso2022kr.rss
Targetpath /resource/charconv
End
start resource 20010102.rss
-target iso2022kr.RSC
+target iso2022kr.rsc
end
SMPSAFE
--- a/charconvfw/charconvplugins/group/jisbase_shared_2.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/jisbase_shared_2.mmp Tue May 25 14:39:28 2010 +0300
@@ -38,7 +38,7 @@
USERINCLUDE ../src/inc
SOURCEPATH ../src/shared
-SOURCE jisbase_shared_2.cpp
+SOURCE JISBASE_SHARED_2.CPP
LIBRARY euser.lib
LIBRARY charconv.lib
--- a/charconvfw/charconvplugins/group/ksc5601.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/ksc5601.mmp Tue May 25 14:39:28 2010 +0300
@@ -39,12 +39,12 @@
SOURCEPATH ../resource
-Start resource ksc5601.RSS
+Start resource ksc5601.rss
Targetpath /resource/charconv
End
start resource 200113CE.rss
-target ksc5601.RSC
+target ksc5601.rsc
end
SMPSAFE
--- a/charconvfw/charconvplugins/group/shiftjis_kddiau_2.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/shiftjis_kddiau_2.mmp Tue May 25 14:39:28 2010 +0300
@@ -35,7 +35,7 @@
USERINCLUDE ../src/inc
SOURCEPATH ../src/plugins
-SOURCE shiftjis_2.cpp
+SOURCE SHIFTJIS_2.CPP
SOURCEPATH ../resource
START RESOURCE shiftjis.rss
--- a/charconvfw/charconvplugins/group/shiftjis_kddiau_shared_2.mmp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/group/shiftjis_kddiau_shared_2.mmp Tue May 25 14:39:28 2010 +0300
@@ -42,7 +42,7 @@
USERINCLUDE ../../charconv_fw/src/charconv
SOURCEPATH ../src/shared
-SOURCE shiftjis_shared_2.cpp
+SOURCE SHIFTJIS_SHARED_2.CPP
SOURCE shiftjiskddiau.cpp
LIBRARY euser.lib
--- a/charconvfw/charconvplugins/resource/10207353.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/10207353.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
/////////////////////////////////////////////////////////////////////////////////
//EucJpDirectmap
RESOURCE REGISTRY_INFO EucJpDirectmapInfo
--- a/charconvfw/charconvplugins/resource/10207354.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/10207354.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
/////////////////////////////////////////////////////////////////////////////////
//ShiftJisDirectmap
RESOURCE REGISTRY_INFO ShiftJisDirectmapInfo
--- a/charconvfw/charconvplugins/resource/10207401.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/10207401.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO KOI8RInfo
{
--- a/charconvfw/charconvplugins/resource/10207402.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/10207402.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO KOI8UInfo
{
--- a/charconvfw/charconvplugins/resource/10207403.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/10207403.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO TIS_620Info
{
--- a/charconvfw/charconvplugins/resource/10207404.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/10207404.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO Windows1250Info
{
--- a/charconvfw/charconvplugins/resource/10207405.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/10207405.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO Windows1251Info
{
--- a/charconvfw/charconvplugins/resource/10207407.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/10207407.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO Windows1253Info
{
--- a/charconvfw/charconvplugins/resource/10207408.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/10207408.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO Windows1254Info
{
--- a/charconvfw/charconvplugins/resource/10207409.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/10207409.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO Windows1255Info
{
--- a/charconvfw/charconvplugins/resource/1020740A.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/1020740A.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO Windows1256Info
{
--- a/charconvfw/charconvplugins/resource/1020740B.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/1020740B.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO Windows1257Info
{
--- a/charconvfw/charconvplugins/resource/1020740C.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/1020740C.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO Windows1258Info
{
--- a/charconvfw/charconvplugins/resource/1020740D.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/1020740D.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO Windows874Info
{
--- a/charconvfw/charconvplugins/resource/2000E527.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/2000E527.rss Tue May 25 14:39:28 2010 +0300
@@ -16,7 +16,7 @@
*/
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO EUC_KRInfo
{
--- a/charconvfw/charconvplugins/resource/20010100.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/20010100.rss Tue May 25 14:39:28 2010 +0300
@@ -17,7 +17,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO CP949Info
{
--- a/charconvfw/charconvplugins/resource/20010102.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/20010102.rss Tue May 25 14:39:28 2010 +0300
@@ -17,7 +17,7 @@
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO ISO2022KRInfo
{
--- a/charconvfw/charconvplugins/resource/200113CE.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/200113CE.rss Tue May 25 14:39:28 2010 +0300
@@ -16,7 +16,7 @@
*/
-#include "Ecom/RegistryInfo.rh"
+#include "ecom/registryinfo.rh"
RESOURCE REGISTRY_INFO KSC5601Info
{
--- a/charconvfw/charconvplugins/resource/EUCKR.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/EUCKR.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
NAME EUCK
// INCLUDES
-#include <UIKON.RH>
+#include <uikon.rh>
RESOURCE RSS_SIGNATURE {}
--- a/charconvfw/charconvplugins/resource/EucJpDirectmap.RSS Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/EucJpDirectmap.RSS Tue May 25 14:39:28 2010 +0300
@@ -24,7 +24,7 @@
// INCLUDES
#include "EucJpDirectmap.RLS"
-#include <UIKON.RH>
+#include <uikon.rh>
// RESOURCE DEFINITIONS
// -----------------------------------------------------------------------------
--- a/charconvfw/charconvplugins/resource/KOI8R.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/KOI8R.rss Tue May 25 14:39:28 2010 +0300
@@ -24,7 +24,7 @@
NAME KO8R
// INCLUDES
-#include <UIKON.RH>
+#include <uikon.rh>
RESOURCE RSS_SIGNATURE {}
--- a/charconvfw/charconvplugins/resource/KOI8U.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/KOI8U.rss Tue May 25 14:39:28 2010 +0300
@@ -24,7 +24,7 @@
NAME KO8U
// INCLUDES
-#include <UIKON.RH>
+#include <uikon.rh>
RESOURCE RSS_SIGNATURE {}
--- a/charconvfw/charconvplugins/resource/ShiftJisDirectmap.RSS Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/ShiftJisDirectmap.RSS Tue May 25 14:39:28 2010 +0300
@@ -24,7 +24,7 @@
// INCLUDES
#include "ShiftJisDirectmap.RLS"
-#include <UIKON.RH>
+#include <uikon.rh>
// RESOURCE DEFINITIONS
// -----------------------------------------------------------------------------
--- a/charconvfw/charconvplugins/resource/TIS_620.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/TIS_620.rss Tue May 25 14:39:28 2010 +0300
@@ -24,7 +24,7 @@
NAME T620
// INCLUDES
-#include <UIKON.RH>
+#include <uikon.rh>
RESOURCE RSS_SIGNATURE {}
--- a/charconvfw/charconvplugins/resource/Win1250.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/Win1250.rss Tue May 25 14:39:28 2010 +0300
@@ -19,7 +19,7 @@
-#include <UIKON.RH>
+#include <uikon.rh>
NAME W250
--- a/charconvfw/charconvplugins/resource/Win1251.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/Win1251.rss Tue May 25 14:39:28 2010 +0300
@@ -19,7 +19,7 @@
-#include <UIKON.RH>
+#include <uikon.rh>
NAME W251
--- a/charconvfw/charconvplugins/resource/Win1253.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/Win1253.rss Tue May 25 14:39:28 2010 +0300
@@ -19,7 +19,7 @@
-#include <UIKON.RH>
+#include <uikon.rh>
NAME W253
--- a/charconvfw/charconvplugins/resource/Win1254.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/Win1254.rss Tue May 25 14:39:28 2010 +0300
@@ -19,7 +19,7 @@
-#include <UIKON.RH>
+#include <uikon.rh>
NAME W254
--- a/charconvfw/charconvplugins/resource/Win1255.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/Win1255.rss Tue May 25 14:39:28 2010 +0300
@@ -24,7 +24,7 @@
NAME W255
// INCLUDES
-#include <UIKON.RH>
+#include <uikon.rh>
RESOURCE RSS_SIGNATURE {}
--- a/charconvfw/charconvplugins/resource/Win1256.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/Win1256.rss Tue May 25 14:39:28 2010 +0300
@@ -24,7 +24,7 @@
NAME W256
// INCLUDES
-#include <UIKON.RH>
+#include <uikon.rh>
RESOURCE RSS_SIGNATURE {}
--- a/charconvfw/charconvplugins/resource/Win1257.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/Win1257.rss Tue May 25 14:39:28 2010 +0300
@@ -19,7 +19,7 @@
-#include <UIKON.RH>
+#include <uikon.rh>
NAME W257
--- a/charconvfw/charconvplugins/resource/Win1258.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/Win1258.rss Tue May 25 14:39:28 2010 +0300
@@ -19,7 +19,7 @@
-#include <UIKON.RH>
+#include <uikon.rh>
NAME W258
--- a/charconvfw/charconvplugins/resource/Win874.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/Win874.rss Tue May 25 14:39:28 2010 +0300
@@ -24,7 +24,7 @@
NAME W874
// INCLUDES
-#include <UIKON.RH>
+#include <uikon.rh>
RESOURCE RSS_SIGNATURE {}
--- a/charconvfw/charconvplugins/resource/iscii.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/iscii.rss Tue May 25 14:39:28 2010 +0300
@@ -24,7 +24,7 @@
// INCLUDES
#include "iscii.rls"
-#include <UIKON.RH>
+#include <uikon.rh>
RESOURCE RSS_SIGNATURE {}
--- a/charconvfw/charconvplugins/resource/iso2022kr.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/iso2022kr.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
NAME ISOK
// INCLUDES
-#include <UIKON.RH>
+#include <uikon.rh>
RESOURCE RSS_SIGNATURE {}
--- a/charconvfw/charconvplugins/resource/ksc5601.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/ksc5601.rss Tue May 25 14:39:28 2010 +0300
@@ -20,7 +20,7 @@
NAME KSC5
// INCLUDES
-#include <UIKON.RH>
+#include <uikon.rh>
RESOURCE RSS_SIGNATURE {}
--- a/charconvfw/charconvplugins/resource/win949.rss Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/resource/win949.rss Tue May 25 14:39:28 2010 +0300
@@ -21,7 +21,7 @@
NAME C949
// INCLUDES
-#include <UIKON.RH>
+#include <uikon.rh>
RESOURCE RSS_SIGNATURE {}
--- a/charconvfw/charconvplugins/src/plugins/big5.cpp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/src/plugins/big5.cpp Tue May 25 14:39:28 2010 +0300
@@ -97,6 +97,7 @@
TInt sumOfWeight=0; //sum of the weights of the chars which are included in the sample
TInt sumOutChar=0; //the number of chars which are not common
TInt sumOfBadSecondByte=0;//the number of chars whose first byte is in the range but not the second
+ TInt sumOfBadSingleByte=0; //the number of bad single byte, which is not in valid range
struct referenceChar
{
TUint charBig5;
@@ -156,11 +157,17 @@
sumOfBadSecondByte++;
}
}
+ // if seldom used characters
+ else if (aSample[i] < 0x20 || aSample[i] > 0x7F )
+ {
+ if (aSample[i]!=0x09 && aSample[i]!=0x0A && aSample[i]!=0x0D)
+ sumOfBadSingleByte++;
+ }
} // for
if (sumOfGoodChar)
{
- aConfidenceLevel=sumOfGoodChar*100/(sumOfBadSecondByte+sumOfGoodChar);
+ aConfidenceLevel=sumOfGoodChar*100/(sumOfBadSecondByte+sumOfGoodChar+sumOfBadSingleByte);
aConfidenceLevel=aConfidenceLevel-Max(0,((totalWeight-sumOfWeight)*sumOfGoodChar/1000));//against frequent chars
aConfidenceLevel=aConfidenceLevel-sumOutChar*100/sumOfGoodChar;//against gap
aConfidenceLevel=(aConfidenceLevel < 0)?0:aConfidenceLevel;
--- a/charconvfw/charconvplugins/src/shared/gb2312_shared.cpp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/src/shared/gb2312_shared.cpp Tue May 25 14:39:28 2010 +0300
@@ -42,6 +42,7 @@
TInt sumOfWeight=0; //sum of the weights of the chars which are included in the sample
TInt sumOutChar=0; //the number of chars which are not common
TInt sumOfBadSecondByte=0;//the number of chars whose first byte is in the range but not the second
+ TInt sumOfBadSingleByte=0; //the number of bad single byte, which is not in valid range
struct referenceChar
{
TUint charGBK;
@@ -105,13 +106,19 @@
sumOfBadSecondByte++;
}
}
+ // if seldom used characters
+ else if (aSample[i] < 0x20 || aSample[i] > 0x7F )
+ {
+ if (aSample[i]!=0x09 && aSample[i]!=0x0A && aSample[i]!=0x0D)
+ sumOfBadSingleByte++;
+ }
} // for
TInt limit;
limit = (10*sampleLength)/100;
if (sumOfGoodChar > limit)
{
- aConfidenceLevel=sumOfGoodChar*100/(sumOfBadSecondByte+sumOfGoodChar);
+ aConfidenceLevel=sumOfGoodChar*100/(sumOfBadSecondByte+sumOfGoodChar+sumOfBadSingleByte);
aConfidenceLevel=aConfidenceLevel-Max(0,((totalWeight-sumOfWeight)*sumOfGoodChar/1000));//against frequent chars
aConfidenceLevel=aConfidenceLevel-(sumOutChar*100/sumOfGoodChar);//against gap
aConfidenceLevel=(aConfidenceLevel < 0)?0:aConfidenceLevel;
--- a/charconvfw/charconvplugins/test/rtest/tsrc/main/tautodetect.cpp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/charconvplugins/test/rtest/tsrc/main/tautodetect.cpp Tue May 25 14:39:28 2010 +0300
@@ -49,6 +49,8 @@
_LIT8(KSomeISO, "\x48\x65\x6a\x21\x20\x0d\x0a\x0d\x0a\x68\xe4\x72\x20\x6b\x6f\x6d\x6d\x65\x72\x20\x65\x74\x74\x20\x6d\x61\x69\x6c\x20\x6d\x65\x64\x20\x6d\x61\x73\x73\x61\x20\x74\x65\x78\x74\x20\x6f\x63\x68\x20\x65\x74\x74\x20\x61\x74\x74\x61\x63\x68\x6d\x65\x6e\x74\x2e\x20\x44\x65\x74\x74\x61\x20\x6c\x69\x6c\x6c\x61\x20\x6d\x61\x69\x6c");
_LIT8(KUnicodeFail,"\x0d");
_LIT8(KISODEF,"\xd7\x6d\x30\xf7"); // Test for defect raised in 6.1 (EXT-5HLEKN)
+_LIT8(KShortUnicode1, "\xff\xfe\x29\x00\x3d\x00");
+_LIT8(KShortUnicode2, "\xff\xfe\x41\x00\x61\x00");
/**
* Work around for DEF063276.
@@ -683,6 +685,8 @@
TestAutodetectL(*arrayOfCharacterSetsAvailable,GB2312Corrupt,KCharacterSetIdentifierGb18030);
TestAutodetectL(*arrayOfCharacterSetsAvailable,KISO, KCharacterSetIdentifierIso88591);
TestAutodetectL(*arrayOfCharacterSetsAvailable,KSomeISO, KCharacterSetIdentifierIso88591);
+ TestAutodetectL(*arrayOfCharacterSetsAvailable,KShortUnicode1,KCharacterSetIdentifierUnicodeLittle);
+ TestAutodetectL(*arrayOfCharacterSetsAvailable,KShortUnicode2,KCharacterSetIdentifierUnicodeLittle);
// INC086007 (and PDEF088039) - start
_LIT8(Kexport,"https://espmg002.ext.nokia.com/push/unifi \nhttps://nam.ext.nokia.com/ \n\nhttp://gutenberg.spiegel.de/doyle/napoleon/Druckversion_napoleon.htm\nhttp://gutenberg.spiegel.de/doyle/baskervi/Druckversion_baske-de.htm\n\nhttp://www.heise.de/newsticker/heise.rdf\nhttp://www.teltarif.de/db/news.rss\nhttp://www.linuxdevices.com/backend/headlines10.rdf\nhttp://www.dpreview.com/news/dpr.rdf\nhttp://planet.maemo.org/rss10.xml\nhttp://www.macnews.de/index.php?_mcnpage=71148\nhttp://www.tecchannel.de/news/feed/complete.rss\nhttp://www.n-tv.de/23.rss\nhttp://www.br-online.de/global/export/dynRdf.jsp?channel=\nhttp://www.wdr.de/xml/newsticker.rdf\nhttp://www.tagesschau.de/newsticker.rdf\nhttp://www.n24.de/rss/?rubrik=home\nhttp://www.n24.de/rss/?rubrik=wirtschaft\nhttp://www.n24.de/rss/?rubrik=politik\nhttp://www.welt.de/z/newsticker/ticker_welt.xml\nhttp://www.ftd.de/static/ticker/ftd-topnews.rdf\nhttp://www.ftd.de/static/container/rss/ftd-rss-1200.rdf\nhttp://www.ftd.de/static/container/rss/ftd-rss-200.rdf\nhttp://www.ftd.de/static/container/rss/ftd-rss-300.rdf\nhttp://rss.cnn.com/rss/cnn_world.rss\nhttp://rss.cnn.com/rss/cnn_tech.rss\nhttp://rss.cnn.com/rss/money_topstories.rss\nhttp://rss.cnn.com/rss/cnn_space.rss\nhttp://news.yandex.ru/index.rss\nhttp://news.yandex.ru/world.rss\nhttp://news.yandex.ru/politics.rss\nhttp://news.yandex.ru/science.rss\nhttp://www.jpost.com/servlet/Satellite?pagename=JPost/Page/RSS&cid=1123495333389\n\n\n\n");
--- a/charconvfw/numbergrouping/Src/NumberGrouping.cpp Tue May 11 17:53:33 2010 +0300
+++ b/charconvfw/numbergrouping/Src/NumberGrouping.cpp Tue May 25 14:39:28 2010 +0300
@@ -35,7 +35,7 @@
const TInt KMinimumLengthToGroup = 1; // No grouping occurs if fewer than this in unformatted buffer
-#include <NumberGrouping.rsg>
+#include <numbergrouping.rsg>
GLDEF_C void Panic(TNumberGroupingPanic aPanic)
--- a/textandloc_plat/japanese_language_utilities_api/inc/jplangutil.h Tue May 11 17:53:33 2010 +0300
+++ b/textandloc_plat/japanese_language_utilities_api/inc/jplangutil.h Tue May 25 14:39:28 2010 +0300
@@ -22,7 +22,7 @@
#define __JPLANGUTIL_H__
// INCLUDES
-#include <E32STD.H>
+#include <e32std.h>
// CONSTANTS
--- a/textrendering/textformatting/tagma/TMGLYPH.CPP Tue May 11 17:53:33 2010 +0300
+++ b/textrendering/textformatting/tagma/TMGLYPH.CPP Tue May 25 14:39:28 2010 +0300
@@ -463,7 +463,7 @@
if (CFont::CharactersJoin(
aDirectionality == ELeftToRight? prevChar : c,
aDirectionality == ELeftToRight? c : prevChar)
- && format.iFontSpec == prevFormat.iFontSpec)
+ && format == prevFormat)
// Characters join at the beginning.
*output = KZeroWidthJoiner;
}
@@ -530,7 +530,7 @@
if (CFont::CharactersJoin(
aDirectionality == ELeftToRight? *prev : nextChar,
aDirectionality == ELeftToRight? nextChar : *prev)
- && format.iFontSpec == nextFormat.iFontSpec)
+ && format == nextFormat)
// Characters join at the end.
*output = KZeroWidthJoiner;
}