SF.net SVN: matplotlib:[8703] trunk/matplotlib

[<ef...@us...>]

Revision: 8703
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8703&view=rev
Author:   efiring
Date:     2010-09-16 00:40:28 +0000 (Thu, 16 Sep 2010)

Log Message:
-----------
Remove obsolete numerix.h

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/src/cntr.c

Removed Paths:
-------------
    trunk/matplotlib/src/numerix.h

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2010-09-16 00:17:09 UTC (rev 8702)
+++ trunk/matplotlib/CHANGELOG	2010-09-16 00:40:28 UTC (rev 8703)
@@ -1,4 +1,4 @@
-2010-09-15 Remove unused _wxagg extension. - EF
+2010-09-15 Remove unused _wxagg extension and numerix.h. - EF
 
 2010-08-25 Add new framework for doing animations with examples.- RM
 

Modified: trunk/matplotlib/src/cntr.c
===================================================================
--- trunk/matplotlib/src/cntr.c	2010-09-16 00:17:09 UTC (rev 8702)
+++ trunk/matplotlib/src/cntr.c	2010-09-16 00:40:28 UTC (rev 8703)
@@ -18,7 +18,7 @@
 #include "structmember.h"
 #include <stdlib.h>
 #include <stdio.h>
-#include "numerix.h"
+#include "numpy/arrayobject.h"
 
 /* Note that all arrays in these routines are Fortran-style,
    in the sense that the "i" index varies fastest; the dimensions
@@ -1804,7 +1804,7 @@
                                                       PyArray_DOUBLE, 2, 2);
     if (marg)
         mpa = (PyArrayObject *) PyArray_ContiguousFromObject(marg,
-                                                      PyArray_SBYTE, 2, 2);
+                                                      PyArray_BYTE, 2, 2);
     else
         mpa = NULL;
 

Deleted: trunk/matplotlib/src/numerix.h
===================================================================
--- trunk/matplotlib/src/numerix.h	2010-09-16 00:17:09 UTC (rev 8702)
+++ trunk/matplotlib/src/numerix.h	2010-09-16 00:40:28 UTC (rev 8703)
@@ -1,11 +0,0 @@
-/* numerix.h	-- John Hunter
- */
-
-#ifndef _NUMERIX_H
-#define _NUMERIX_H
-#include "numpy/arrayobject.h"
-#if (NDARRAY_VERSION >= 0x00090908)
-#include "numpy/oldnumeric.h"
-#endif
-
-#endif


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