Windows-related fixes, thanks to @cgohlke

mdboom · mdboom · commit 5204635911f9 · 2014-10-17T15:43:35.000-04:00
diff --git a/src/_gtkagg.cpp b/src/_gtkagg.cpp
@@ -1,4 +1,3 @@
-
 /* -*- mode: c++; c-basic-offset: 4 -*- */
 
 #include <vector>
@@ -62,7 +61,7 @@ static PyObject *Py_agg_to_gtk_drawable(PyObject *self, PyObject *args, PyObject
 
     if (rect.x1 == 0.0 && rect.x2 == 0.0 && rect.y1 == 0.0 && rect.y2 == 0.0) {
         // bbox is None; copy the entire image
-        destbufferptr = (agg::int8u *)buffer;
+        destbufferptr = (agg::int8u *)buffer.data();
         destwidth = srcwidth;
         destheight = srcheight;
         deststride = srcstride;
@@ -81,7 +80,7 @@ static PyObject *Py_agg_to_gtk_drawable(PyObject *self, PyObject *args, PyObject
         renderer_base destrb(destpf);
 
         agg::rendering_buffer srcrbuf;
-        srcrbuf.attach((agg::int8u *)buffer, buffer.dim(1), buffer.dim(0), buffer.dim(1) * 4);
+        srcrbuf.attach((agg::int8u *)buffer.data(), buffer.dim(1), buffer.dim(0), buffer.dim(1) * 4);
 
         agg::rect_base<int> region(destx, desty, (int)rect.x2, srcheight - (int)rect.y1);
         destrb.copy_from(srcrbuf, &region, -destx, -desty);
diff --git a/src/_image.h b/src/_image.h
@@ -231,7 +231,7 @@ Image *pcolor(CoordinateArray &x,
     // Check dimensions match
     unsigned long nx = x.dim(0);
     unsigned long ny = y.dim(0);
-    if (nx != d.dim(1) || ny != d.dim(0)) {
+    if (nx != (unsigned long)d.dim(1) || ny != (unsigned long)d.dim(0)) {
         throw "data and axis dimensions do not match";
     }
 
@@ -337,7 +337,7 @@ Image *pcolor2(CoordinateArray &x,
     // Check dimensions match
     unsigned long nx = x.dim(0);
     unsigned long ny = y.dim(0);
-    if (nx != d.dim(1) + 1 || ny != d.dim(0) + 1) {
+    if (nx != (unsigned long)d.dim(1) + 1 || ny != (unsigned long)d.dim(0) + 1) {
         throw "data and axis bin boundary dimensions are incompatible";
     }
 
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -7,6 +7,10 @@
 #include "ft2font.h"
 #include "mplutils.h"
 
+#ifndef M_PI
+#define M_PI 3.14159265358979323846264338328
+#endif
+
 /**
  To improve the hinting of the fonts, this code uses a hack
  presented here:
diff --git a/src/mplutils.h b/src/mplutils.h
@@ -5,6 +5,12 @@
 #ifndef _MPLUTILS_H
 #define _MPLUTILS_H
 
+#ifdef _MSC_VER && _MSC_VER <= 1600
+typedef unsigned __int8   uint8_t;
+#else
+#include <stdint.h>
+#endif
+
 #include <Python.h>
 
 #if PY_MAJOR_VERSION >= 3
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -116,13 +116,15 @@ struct type_num_of<npy_double>
         value = NPY_DOUBLE
     };
 };
+#if NPY_LONGDOUBLE != NPY_DOUBLE
 template <>
 struct type_num_of<npy_longdouble>
 {
     enum {
         value = NPY_LONGDOUBLE
     };
 };
+#endif
 template <>
 struct type_num_of<npy_cfloat>
 {
@@ -151,13 +153,15 @@ struct type_num_of<std::complex<npy_double> >
         value = NPY_CDOUBLE
     };
 };
+#if NPY_CLONGDOUBLE != NPY_CDOUBLE
 template <>
 struct type_num_of<npy_clongdouble>
 {
     enum {
         value = NPY_CLONGDOUBLE
     };
 };
+#endif
 template <>
 struct type_num_of<std::complex<npy_longdouble> >
 {
