-/* $Id$
-
-This file is part of libmspstrings
-Copyright © 2006-2007 Mikko Rasa
-Distributed under the LGPL
-*/
-
#include "codecutils.h"
#include "iso885915.h"
namespace Msp {
-namespace Codecs {
+namespace StringCodec {
-void Iso885915::Encoder::encode_char(UnicodeChar ch, string &buf)
+void Iso885915::Encoder::encode_char(unichar ch, string &buf)
{
int tch = transform_mapping_or_direct(mapping, map_size, ch, false);
if(tch<0 || tch>0xFF)
}
-void Iso885915::Encoder::transliterate(UnicodeChar, string &buf)
+void Iso885915::Encoder::transliterate(unichar, string &buf)
{
buf += '?';
}
-UnicodeChar Iso885915::Decoder::decode_char(const string &str, string::const_iterator &i)
+unichar Iso885915::Decoder::decode_char(const string &str, string::const_iterator &i)
{
if(i==str.end())
- return error("No input");
-
- unsigned char ch = *i;
- int tch = transform_mapping_or_direct(mapping, map_size, ch, true);
-
- UnicodeChar result;
- if(tch==-1)
- result = error("Undefined ISO-8859-15 character");
- else
- result = tch;
+ return -1;
- ++i;
- return result;
+ unsigned char ch = *i++;
+ return transform_mapping_or_direct(mapping, map_size, ch, true);
}
-} // namespace Codecs
+} // namespace StringCodec
} // namespace Msp