X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fstringcodec%2Fiso885915.cpp;h=eb26264d8dd5bacd7d72bc481ffbad5632dc25c7;hp=3e71f753afcfdfdc6ce1c57c75378cb1f01c9cad;hb=817e584903996a041692640720a5a272d847a3c7;hpb=02794ef3620d0d9cc3b8f1c0d8f2995c825fdf4f

diff --git a/source/stringcodec/iso885915.cpp b/source/stringcodec/iso885915.cpp
index 3e71f75..eb26264 100644
--- a/source/stringcodec/iso885915.cpp
+++ b/source/stringcodec/iso885915.cpp
@@ -29,7 +29,7 @@ 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)
-		error(ch, buf, "Can't express character in ISO-8859-15");
+		error(ch, buf, invalid_character(ch, "ISO-8859-15"));
 	else
 		buf += tch;
 
@@ -44,19 +44,10 @@ void Iso885915::Encoder::transliterate(unichar, string &buf)
 unichar Iso885915::Decoder::decode_char(const string &str, string::const_iterator &i)
 {
 	if(i==str.end())
-		return error("No input");
+		return -1;
 
-	unsigned char ch = *i;
-	int tch = transform_mapping_or_direct(mapping, map_size, ch, true);
-
-	unichar result;
-	if(tch==-1)
-		result = error("Undefined ISO-8859-15 character");
-	else
-		result = tch;
-
-	++i;
-	return result;
+	unsigned char ch = *i++;
+	return transform_mapping_or_direct(mapping, map_size, ch, true);
 }
 
 } // namespace StringCodec