[pclasses-cvs] pclasses2/src/IO StringDevice.cpp,1.1,1.2

[Christian P. <cp...@us...>]

Update of /cvsroot/pclasses/pclasses2/src/IO
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28319/src/IO

Modified Files:
	StringDevice.cpp 
Log Message:
- Fixed export macros
- Fixed StringDevice


Index: StringDevice.cpp
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/src/IO/StringDevice.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- StringDevice.cpp	1 Jan 2005 19:24:27 -0000	1.1
+++ StringDevice.cpp	26 Apr 2005 12:19:55 -0000	1.2
@@ -8,13 +8,14 @@
 	StringDevice::peek(char *buffer, size_t count) throw (IOError)
 	{
 		size_t at = this->getPos();
-		size_t to = ( (count + at) > this->size() )
+		size_t to = ((count + at) > (size_t)this->size() )
 			? this->size()
 			: at + count;
 		size_t ret = 0;
 		for( ; at < to; at++ )
 		{
-			buffer[ret++] = this->m_buf.at(at).latin1();
+			memcpy(buffer + ret, &this->m_buf.at(at), sizeof(Unicode::Char));
+			ret += sizeof(Unicode::Char);
 		}
 		return ret;
 	}