trunk/branch integration: TextEncoding update

This commit is contained in:
Marian Krivos
2011-08-22 18:22:56 +00:00
parent d35ecf85a2
commit e066d033a2
8 changed files with 391 additions and 80 deletions

View File

@@ -151,7 +151,7 @@ TextEncoding::~TextEncoding()
int TextEncoding::convert(const unsigned char* bytes) const
{
return (int) *bytes;
return static_cast<int>(*bytes);
}
@@ -161,6 +161,18 @@ int TextEncoding::convert(int ch, unsigned char* bytes, int length) const
}
int TextEncoding::queryConvert(const unsigned char* bytes, int length) const
{
return (int) *bytes;
}
int TextEncoding::sequenceLength(const unsigned char* bytes, int length) const
{
return 1;
}
TextEncoding& TextEncoding::byName(const std::string& encodingName)
{
TextEncoding* pEncoding = manager().find(encodingName);
@@ -209,9 +221,14 @@ TextEncoding& TextEncoding::global()
}
TextEncodingManager& TextEncoding::manager()
namespace
{
static SingletonHolder<TextEncodingManager> sh;
}
TextEncodingManager& TextEncoding::manager()
{
return *sh.get();
}