Changeset 1393:39514fa9856d

Timestamp:

11/05/09 18:08:28 (2 years ago)

Author:

niam

Branch:

default

Message:

fixes after branch merge

Location:

src/src

Files:

• graphicsImage.cc (modified) (1 diff)
• ioBlockChannel.cc (modified) (1 diff)
• ioStreamChannel.cc (modified) (2 diffs)

src/src/graphicsImage.cc

@@ -431 +431 @@
         throw exception::basic(exception::MODULE_GRAPHICSIMAGE, IMAGEEX_WRITE, exception::ERRNO_IMAGEMAGICK, ((ExceptionInfo *)exInfo)->error_number, ((ExceptionInfo *)exInfo)->reason, __LINE__, __FILE__, ((ExceptionInfo *)exInfo)->description ? ((ExceptionInfo *)exInfo)->description : __dodostring__);
 
-    img.blockSize = size;
+    img.bs = size;
     img.write((char *)imData);
 

src/src/ioBlockChannel.cc

@@ -70 +70 @@
     try {
         n = _read((char *)data.data());
+        data.resize(n);
     } catch (...) {
         data.clear();

src/src/ioStreamChannel.cc

@@ -58 +58 @@
 
     dodoString data;
+    unsigned long n;
 
 #ifndef IO_WO_XEXEC
@@ -68 +69 @@
 
     try {
-        _read((char *)data.data());
+        n = _read((char *)data.data());
+        data.resize(n);
     } catch (...) {
         data.clear();