@@ -41,7 +41,8 @@
 namespace Poco {
 
 
-HexBinaryDecoderBuf::HexBinaryDecoderBuf(std::istream& istr): _istr(istr)
+HexBinaryDecoderBuf::HexBinaryDecoderBuf(std::istream& istr): 
+        _buf(*istr.rdbuf())
 {
 }
 
@@ -61,13 +62,13 @@ int HexBinaryDecoderBuf::readFromDevice()
 	else if (n >= 'A' && n <= 'F')
 		c = n - 'A' + 10;
 	else if (n >= 'a' && n <= 'f')
-		c = n - 'a' + 10;
-	else throw DataFormatException();
-	c <<= 4;
-	if ((n = readOne()) == -1) return -1;
-	if (n >= '0' && n <= '9')
-		c |= n - '0';
-	else if (n >= 'A' && n <= 'F')
+                c = n - 'a' + 10;
+        else throw DataFormatException();
+        c <<= 4;
+        if ((n = readOne()) == -1) throw DataFormatException();
+        if (n >= '0' && n <= '9')
+                c |= n - '0';
+        else if (n >= 'A' && n <= 'F')
 		c |= n - 'A' + 10;
 	else if (n >= 'a' && n <= 'f')
 		c |= n - 'a' + 10;
@@ -78,10 +79,10 @@ int HexBinaryDecoderBuf::readFromDevice()
 
 int HexBinaryDecoderBuf::readOne()
 {
-	int ch = _istr.get();
-	while (ch == ' ' || ch == '\r' || ch == '\t' || ch == '\n')
-		ch = _istr.get();
-	return ch;
+        int ch = _buf.sbumpc();
+        while (ch == ' ' || ch == '\r' || ch == '\t' || ch == '\n')
+                ch = _buf.sbumpc();
+        return ch;
 }
 
 
 
@@ -1,7 +1,7 @@
 //
 // HexBinaryEncoder.cpp
 //
-// $Id: //poco/svn/Foundation/src/HexBinaryEncoder.cpp#2 $
+// $Id: //poco/1.4/Foundation/src/HexBinaryEncoder.cpp#2 $
 //
 // Library: Foundation
 // Package: Streams
@@ -41,10 +41,10 @@ namespace Poco {
 
 
 HexBinaryEncoderBuf::HexBinaryEncoderBuf(std::ostream& ostr): 
-	_pos(0),
-	_lineLength(72),
-	_uppercase(0),
-	_ostr(ostr)
+        _pos(0),
+        _lineLength(72),
+        _uppercase(0),
+        _buf(*ostr.rdbuf())
 {
 }
 
@@ -81,24 +81,25 @@ void HexBinaryEncoderBuf::setUppercase(bool flag)
 
 int HexBinaryEncoderBuf::writeToDevice(char c)
 {
-	static const char digits[] = "0123456789abcdef0123456789ABCDEF";
-	_ostr.put(digits[_uppercase + ((c >> 4) & 0xF)]);
-	++_pos;
-	_ostr.put(digits[_uppercase + (c & 0xF)]);
-	if (++_pos >= _lineLength && _lineLength > 0) 
-	{
-		_ostr << std::endl;
-		_pos = 0;
-	}
-	return _ostr ? charToInt(c) : -1;
+        static const int eof = std::char_traits<char>::eof();
+        static const char digits[] = "0123456789abcdef0123456789ABCDEF";
+        
+        if (_buf.sputc(digits[_uppercase + ((c >> 4) & 0xF)]) == eof) return eof;
+        ++_pos;
+        if (_buf.sputc(digits[_uppercase + (c & 0xF)]) == eof) return eof;
+        if (++_pos >= _lineLength && _lineLength > 0) 
+        {
+                if (_buf.sputc('\n') == eof) return eof;
+                _pos = 0;
+        }
+        return charToInt(c);
 }
 
 
 int HexBinaryEncoderBuf::close()
 {
-	sync();
-	_ostr.flush();
-	return _ostr ? 0 : -1;
+        sync();
+        return _buf.pubsync();
 }