SC

Steve Chaplin · Steve Chaplin · commit 8f505f2ebe3f · 2007-01-16T00:33:39.000Z
svn path=/trunk/matplotlib/; revision=2987
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,7 @@
-2007-01-15 src/_image.cpp combine buffer_argb32() and buffer_bgra32() into
+2007-01-16 src/_image.cpp: update to use Py_ssize_t (for 64-bit systems).
+           Use return value of fread() to prevent warning messages - SC.
+
+2007-01-15 src/_image.cpp: combine buffer_argb32() and buffer_bgra32() into
            a new method color_conv(format) - SC
 
 2007-01-14 backend_cairo.py: update draw_arc() so that
diff --git a/lib/matplotlib/backends/backend_gtkcairo.py b/lib/matplotlib/backends/backend_gtkcairo.py
@@ -7,7 +7,7 @@
     import cairo.gtk
 
 from matplotlib.backends import backend_cairo
-from   matplotlib.backends.backend_gtk import *
+from matplotlib.backends.backend_gtk import *
 
 backend_version = 'PyGTK(%d.%d.%d) ' % gtk.pygtk_version + \
                   'Pycairo(%s)' % backend_cairo.backend_version
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -232,14 +232,16 @@ Image::color_conv(const Py::Tuple& args) {
   PyObject* py_buffer = PyBuffer_New(row_len * rowsOut);
   if (py_buffer ==NULL)
     throw Py::MemoryError("Image::color_conv could not allocate memory");
-  unsigned char* buf;
-  int buffer_len;
-  int ret = PyObject_AsWriteBuffer(py_buffer, (void **)&buf, &buffer_len);
+
+  void* buf;
+  Py_ssize_t buffer_len;
+  int ret = PyObject_AsWriteBuffer(py_buffer, &buf, &buffer_len);
   if (ret !=0)
     throw Py::MemoryError("Image::color_conv could not allocate memory");
 
   agg::rendering_buffer rtmp;
-  rtmp.attach(buf, colsOut, rowsOut, row_len);
+  rtmp.attach(reinterpret_cast<unsigned char*>(buf), colsOut, rowsOut,
+	      row_len);
 
   switch (format) {
   case 0:
@@ -869,7 +871,8 @@ _image_module::readpng(const Py::Tuple& args) {
   if (!fp)
     throw Py::RuntimeError(Printf("_image_module::readpng could not open PNG file %s for reading", fname.c_str()).str());
 
-  fread(header, 1, 8, fp);
+  if (fread(header, 1, 8, fp) != 8)
+    throw Py::RuntimeError("_image_module::readpng: error reading PNG header");
   if (png_sig_cmp(header, 0, 8))
     throw Py::RuntimeError("_image_module::readpng: file not recognized as a PNG file");
 
