diff options
Diffstat (limited to 'src/lib/libpgplus_utils.cpp')
| -rw-r--r-- | src/lib/libpgplus_utils.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libpgplus_utils.cpp b/src/lib/libpgplus_utils.cpp index c84e107..967df74 100644 --- a/src/lib/libpgplus_utils.cpp +++ b/src/lib/libpgplus_utils.cpp @@ -32,9 +32,9 @@ #define PGPLUS_NUM_ELEMENTS(array) sizeof(array)/sizeof(array[0]) -uint8_t libpgplus::readU8(WPXInputStream *input) +uint8_t libpgplus::readU8(librevenge::RVNGInputStream *input) { - if (!input || input->atEOS()) + if (!input || input->isEnd()) throw EndOfStreamException(); unsigned long numBytesRead; uint8_t const *p = input->read(sizeof(uint8_t), numBytesRead); @@ -44,14 +44,14 @@ uint8_t libpgplus::readU8(WPXInputStream *input) throw EndOfStreamException(); } -uint16_t libpgplus::readU16(WPXInputStream *input) +uint16_t libpgplus::readU16(librevenge::RVNGInputStream *input) { uint16_t p0 = (uint16_t)readU8(input); uint16_t p1 = (uint16_t)readU8(input); return (uint16_t)(p0|(p1<<8)); } -uint32_t libpgplus::readU32(WPXInputStream *input) +uint32_t libpgplus::readU32(librevenge::RVNGInputStream *input) { uint32_t p0 = (uint32_t)readU8(input); uint32_t p1 = (uint32_t)readU8(input); @@ -60,12 +60,12 @@ uint32_t libpgplus::readU32(WPXInputStream *input) return (uint32_t)(p0|(p1<<8)|(p2<<16)|(p3<<24)); } -int32_t libpgplus::readS32(WPXInputStream *input) +int32_t libpgplus::readS32(librevenge::RVNGInputStream *input) { return (int32_t)readU32(input); } -uint64_t libpgplus::readU64(WPXInputStream *input) +uint64_t libpgplus::readU64(librevenge::RVNGInputStream *input) { uint64_t p0 = (uint64_t)readU8(input); uint64_t p1 = (uint64_t)readU8(input); |