SF.net SVN: matplotlib:[6475] trunk/matplotlib/src

[<md...@us...>]

Revision: 6475
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6475&view=rev
Author:   mdboom
Date:     2008-12-02 19:51:10 +0000 (Tue, 02 Dec 2008)

Log Message:
-----------
suppress gcc-4.3 warnings

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

Modified: trunk/matplotlib/src/_backend_agg.cpp
===================================================================
--- trunk/matplotlib/src/_backend_agg.cpp	2008-12-02 17:55:15 UTC (rev 6474)
+++ trunk/matplotlib/src/_backend_agg.cpp	2008-12-02 19:51:10 UTC (rev 6475)
@@ -1216,8 +1216,8 @@
 
   private:
     inline unsigned vertex(unsigned idx, double* x, double* y) {
-      size_t m = m_m + ((idx   & 0x2) >> 1);
-      size_t n = m_n + ((idx+1 & 0x2) >> 1);
+      size_t m = m_m + ((idx     & 0x2) >> 1);
+      size_t n = m_n + (((idx+1) & 0x2) >> 1);
       double* pair = (double*)PyArray_GETPTR2(m_coordinates, n, m);
       *x = *pair++;
       *y = *pair;
@@ -1336,11 +1336,15 @@
       throw Py::RuntimeError(e);
     }
   } catch (...) {
-    if (free_edgecolors) Py_XDECREF(edgecolors_obj.ptr());
+    if (free_edgecolors) {
+      Py_XDECREF(edgecolors_obj.ptr());
+    }
     throw;
   }
 
-  if (free_edgecolors) Py_XDECREF(edgecolors_obj.ptr());
+  if (free_edgecolors) {
+    Py_XDECREF(edgecolors_obj.ptr());
+  }
 
   return Py::Object();
 }

Modified: trunk/matplotlib/src/_image.cpp
===================================================================
--- trunk/matplotlib/src/_image.cpp	2008-12-02 17:55:15 UTC (rev 6474)
+++ trunk/matplotlib/src/_image.cpp	2008-12-02 19:51:10 UTC (rev 6475)
@@ -1327,20 +1327,27 @@
 void _pcolor_cleanup(PyArrayObject* x, PyArrayObject* y,  PyArrayObject *d,
                                         unsigned int * rowstarts ,unsigned int*colstarts ,
                                         float *acols , float *arows) {
-    if (x)
+    if (x) {
       Py_XDECREF(x);
-    if (y)
+    }
+    if (y) {
       Py_XDECREF(y);
-    if(d)
+    }
+    if(d) {
       Py_XDECREF(d);
-    if(rowstarts)
+    }
+    if(rowstarts) {
       PyMem_Free(rowstarts);
-    if(colstarts)
+    }
+    if(colstarts) {
       PyMem_Free(colstarts);
-    if(acols)
+    }
+    if(acols) {
       PyMem_Free(acols);
-    if(arows)
+    }
+    if(arows) {
       PyMem_Free(arows);
+    }
     return;
 }
 


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