Thread: SF.net SVN: matplotlib:[6060] trunk/matplotlib/src/_image.cpp

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 6060
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6060&view=rev
Author:   efiring
Date:     2008-09-01 22:50:47 +0000 (Mon, 01 Sep 2008)

Log Message:
-----------
Allocate acols, arows only if needed; change suggested by Mike D.
Other slight cleanups in _image.cpp.

Modified Paths:
--------------
    trunk/matplotlib/src/_image.cpp

Modified: trunk/matplotlib/src/_image.cpp
===================================================================

--- trunk/matplotlib/src/_image.cpp	2008-09-01 22:27:07 UTC (rev 6059)
+++ trunk/matplotlib/src/_image.cpp	2008-09-01 22:50:47 UTC (rev 6060)
@@ -711,7 +711,7 @@
   size_t numrows = (size_t)Py::Int(args[0]);
   size_t numcols = (size_t)Py::Int(args[1]);
 
-  if (numrows > 1 << 15 || numcols > 1 << 15) {
+  if (numrows >= 32768 || numcols >= 32768) {
     throw Py::RuntimeError("numrows and numcols must both be less than 32768");
   }
 
@@ -1088,7 +1088,7 @@
   size_t x = Py::Int(args[1]);
   size_t y = Py::Int(args[2]);
 
-  if (x > 1 << 15 || y > 1 << 15) {
+  if (x >= 32768 || y >= 32768) {
     throw Py::ValueError("x and y must both be less than 32768");
   }
 
@@ -1335,7 +1335,7 @@
       PyMem_Free(arows);
     return;
 }
-    
+
 Py::Object
 _image_module::pcolor(const Py::Tuple& args) {
   _VERBOSE("_image_module::pcolor");
@@ -1352,7 +1352,7 @@
   Py::Tuple bounds = args[5];
   unsigned int interpolation = Py::Int(args[6]);
 
-  if (rows > 1 << 15 || cols > 1 << 15) {
+  if (rows >= 32768 || cols >= 32768) {
     throw Py::ValueError("rows and cols must both be less than 32768");
   }
 
@@ -1370,11 +1370,11 @@
   // Check we have something to output to
   if (rows == 0 || cols ==0)
       throw Py::ValueError("Cannot scale to zero size");
-  
+
   PyArrayObject *x = NULL; PyArrayObject *y = NULL; PyArrayObject *d = NULL;
   unsigned int * rowstarts = NULL; unsigned int*colstarts = NULL;
   float *acols = NULL; float *arows = NULL;
-  
+
   // Get numpy arrays
   x = (PyArrayObject *) PyArray_ContiguousFromObject(xp.ptr(), PyArray_FLOAT, 1, 1);
   if (x == NULL) {
@@ -1406,14 +1406,12 @@
 
   // Allocate memory for pointer arrays
   rowstarts = reinterpret_cast<unsigned int*>(PyMem_Malloc(sizeof(unsigned int)*rows));
-  arows = reinterpret_cast<float *>(PyMem_Malloc(sizeof(float)*rows));
-  if (rowstarts == NULL || arows == NULL ) {
+  if (rowstarts == NULL) {
      _pcolor_cleanup(x,y,d,rowstarts,colstarts,acols,arows);
       throw Py::MemoryError("Cannot allocate memory for lookup table");
   }
   colstarts = reinterpret_cast<unsigned int*>(PyMem_Malloc(sizeof(unsigned int)*cols));
-  acols = reinterpret_cast<float*>(PyMem_Malloc(sizeof(float)*cols));
-  if (colstarts == NULL || acols == NULL) {
+  if (colstarts == NULL) {
      _pcolor_cleanup(x,y,d,rowstarts,colstarts,acols,arows);
       throw Py::MemoryError("Cannot allocate memory for lookup table");
   }
@@ -1430,8 +1428,8 @@
      _pcolor_cleanup(x,y,d,rowstarts,colstarts,acols,arows);
       throw Py::MemoryError("Could not allocate memory for image");
   }
-  
 
+
   // Calculate the pointer arrays to map input x to output x
   unsigned int i, j;
   unsigned int * colstart = colstarts;
@@ -1451,7 +1449,7 @@
   start = reinterpret_cast<unsigned char*>(d->data);
     int s0 = d->strides[0];
     int s1 = d->strides[1];
-  
+
   if(interpolation == Image::NEAREST) {
       _bin_indices_middle(colstart, cols, xs1,  nx,dx,x_min);
       _bin_indices_middle(rowstart, rows, ys1,  ny, dy,y_min);
@@ -1473,11 +1471,22 @@
       }
   }
   else if(interpolation == Image::BILINEAR) {
+      arows = reinterpret_cast<float *>(PyMem_Malloc(sizeof(float)*rows));
+      if (arows == NULL ) {
+         _pcolor_cleanup(x,y,d,rowstarts,colstarts,acols,arows);
+          throw Py::MemoryError("Cannot allocate memory for lookup table");
+      }
+      acols = reinterpret_cast<float*>(PyMem_Malloc(sizeof(float)*cols));
+      if (acols == NULL) {
+         _pcolor_cleanup(x,y,d,rowstarts,colstarts,acols,arows);
+          throw Py::MemoryError("Cannot allocate memory for lookup table");
+      }
+
       _bin_indices_middle_linear(acols, colstart, cols, xs1,  nx,dx,x_min);
       _bin_indices_middle_linear(arows, rowstart, rows, ys1,  ny, dy,y_min);
       double a00,a01,a10,a11,alpha,beta;
-      
-      
+
+
         agg::int8u * start00;
         agg::int8u * start01;
         agg::int8u * start10;
@@ -1489,12 +1498,12 @@
             {
                 alpha=arows[i];
                 beta=acols[j];
-                
+
                 a00=alpha*beta;
                 a01=alpha*(1.0-beta);
                 a10=(1.0-alpha)*beta;
                 a11=1.0-a00-a01-a10;
-                
+
                 start00=(agg::int8u *)(start + s0*rowstart[i] + s1*colstart[j]);
                 start01=start00+s1;
                 start10=start00+s0;
@@ -1506,22 +1515,18 @@
                 position += 4;
             }
         }
-        
+
     }
 
-
-  // Attatch output buffer to output buffer
+  // Attach output buffer to output buffer
   imo->rbufOut = new agg::rendering_buffer;
   imo->bufferOut = buffer;
   imo->rbufOut->attach(imo->bufferOut, imo->colsOut, imo->rowsOut, imo->colsOut * imo->BPP);
 
-  
    _pcolor_cleanup(x,y,d,rowstarts,colstarts,acols,arows);
 
   return Py::asObject(imo);
-    
 
-  
 }
 
 
@@ -1548,7 +1553,7 @@
     Py::Tuple bounds = args[5];
     Py::Object bgp = args[6];
 
-    if (rows > 1 << 15 || cols > 1 << 15) {
+    if (rows >= 32768 || cols >= 32768) {
       throw Py::ValueError("rows and cols must both be less than 32768");
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: SF.net SVN: matplotlib:[6060] trunk/matplotlib/src/_image.cpp

matplotlib-checkins