From 6bf7fec64eabc88c4e3734c8a99c5f10c6fcd962 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 24 May 2007 09:49:22 +0000 Subject: [PATCH] From Olaf, "there are more dubious calls to istream::readsome instead of istream::read. IMHO it does make no sense here and potentially breaks this plugin." --- src/osgPlugins/txf/TXFFont.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/txf/TXFFont.cpp b/src/osgPlugins/txf/TXFFont.cpp index aea1a4e6b..b33963014 100644 --- a/src/osgPlugins/txf/TXFFont.cpp +++ b/src/osgPlugins/txf/TXFFont.cpp @@ -46,14 +46,14 @@ static inline void swap(unsigned& x, bool isSwapped) static inline unsigned char readByte(std::istream& stream) { unsigned char x; - stream.readsome(reinterpret_cast(&x), 1); + stream.read(reinterpret_cast(&x), 1); return x; } static inline unsigned short readShort(std::istream& stream, bool isSwapped) { unsigned short x; - stream.readsome(reinterpret_cast(&x), 2); + stream.read(reinterpret_cast(&x), 2); swap(x, isSwapped); return x; } @@ -61,7 +61,7 @@ static inline unsigned short readShort(std::istream& stream, bool isSwapped) static inline unsigned readInt(std::istream& stream, bool isSwapped) { unsigned x; - stream.readsome(reinterpret_cast(&x), 4); + stream.read(reinterpret_cast(&x), 4); swap(x, isSwapped); return x; }