Fix a number of minor issues discovered with "-pedantic"

mdboom · mdboom · commit 055de94e6c0a · 2008-05-05T15:12:29.000Z
svn path=/trunk/matplotlib/; revision=5111
diff --git a/src/MPL_isnan.h b/src/MPL_isnan.h
@@ -8,6 +8,10 @@ code only works on doubles.
 
 */
 
+#ifdef _ISOC99_SOURCE
+#include <stdint.h>
+#endif
+
 #if defined(SIZEOF_VOID_P)
 #if SIZEOF_VOID_P == 8
 #define MPL_LP64 1
@@ -24,9 +28,13 @@ typedef long int                 MPL_Int64;
 #if defined(_MSC_VER)
 typedef __int64                  MPL_Int64;
 #else
+#if defined(_ISOC99_SOURCE)
+typedef int64_t                  MPL_Int64;
+#else
 typedef long long                MPL_Int64;
 #endif
 #endif
+#endif
 
 #if !defined(MPL_U64)
 #define MPL_U64(u) (* (MPL_Int64 *) &(u) )
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -249,7 +249,7 @@ RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi,
   //theRasterizer->filling_rule(agg::fill_even_odd);
   //theRasterizer->filling_rule(agg::fill_non_zero);
 
-};
+}
 
 void RendererAgg::create_alpha_buffers() {
   if (!alphaBuffer) {
@@ -1762,4 +1762,4 @@ DL_EXPORT(void)
   static _backend_agg_module* _backend_agg = NULL;
   _backend_agg = new _backend_agg_module;
 
-};
+}
diff --git a/src/_image.cpp b/src/_image.cpp
@@ -826,7 +826,7 @@ _image_module::from_images(const Py::Tuple& args) {
       for (size_t i=0; i<thisim->colsOut; i++) {
 	thisx = i+ox;
 	thisy = j+oy;
-	if (thisx<0 || thisx>=numcols || thisy<0 || thisy>=numrows) {
+	if (thisx>=numcols || thisy>=numrows) {
 	  ind +=4;
 	  continue;
 	}
diff --git a/src/_image.h b/src/_image.h
@@ -61,7 +61,7 @@ class Image : public Py::PythonExtension<Image> {
         MITCHELL,
         SINC,
         LANCZOS,
-        BLACKMAN,};
+        BLACKMAN};
 
   //enum { BICUBIC=0, BILINEAR, BLACKMAN100, BLACKMAN256, BLACKMAN64,
   //	 NEAREST, SINC144, SINC256, SINC64, SPLINE16, SPLINE36};
diff --git a/src/_path.cpp b/src/_path.cpp
@@ -1161,4 +1161,4 @@ extern "C"
 
     static _path_module* _path = NULL;
     _path = new _path_module;
-};
+}
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -27,7 +27,7 @@ extern "C" {
 #else
 #  include <tk.h>
 #endif
-};
+}
 
 
 
diff --git a/src/_ttconv.cpp b/src/_ttconv.cpp
@@ -204,7 +204,7 @@ static PyMethodDef ttconv_methods[] = {
    "the values are the stream content needed to render that glyph.  This\n"
    "is useful to generate the CharProcs dictionary in a PDF Type 3 font.\n"
   },
-  {NULL}  /* Sentinel */
+  {0, 0, 0, 0}  /* Sentinel */
 };
 
 #ifndef PyMODINIT_FUNC	/* declarations for DLL import/export */
diff --git a/src/cntr.c b/src/cntr.c
@@ -1688,7 +1688,7 @@ static PyMethodDef Cntr_methods[] = {
      "    Optional argument: nchunk; approximate number of grid points\n"
      "        per chunk. 0 (default) for no chunking.\n"
     },
-    {NULL}  /* Sentinel */
+    {0, 0, 0, 0}  /* Sentinel */
 };
 
 static PyTypeObject CntrType = {
diff --git a/src/ft2font.cpp b/src/ft2font.cpp
@@ -153,8 +153,7 @@ FT2Image::py_write_bitmap(const Py::Tuple & args) {
 void
 FT2Image::draw_rect(unsigned long x0, unsigned long y0,
 		    unsigned long x1, unsigned long y1) {
-  if ( x0<0 || y0<0 || x1<0 || y1<0 ||
-       x0>_width || x1>_width ||
+  if ( x0>_width || x1>_width ||
        y0>_height || y1>_height )
     throw Py::ValueError("Rect coords outside image bounds");
 
@@ -197,10 +196,10 @@ FT2Image::py_draw_rect(const Py::Tuple & args) {
 
 void FT2Image::draw_rect_filled(unsigned long x0, unsigned long y0,
 				unsigned long x1, unsigned long y1) {
-  x0 = CLAMP(x0, 0, _width);
-  y0 = CLAMP(y0, 0, _height);
-  x1 = CLAMP(x1, 0, _width);
-  y1 = CLAMP(y1, 0, _height);
+  x0 = std::min(x0, _width);
+  y0 = std::min(y0, _height);
+  x1 = std::min(x1, _width);
+  y1 = std::min(y1, _height);
 
   for (size_t j=y0; j<y1+1; j++) {
     for (size_t i=x0; i<x1+1; i++) {
@@ -1207,7 +1206,7 @@ char FT2Font::draw_glyph_to_bitmap__doc__[] =
 "draw_glyphs_to_bitmap.  This function is intended for people who\n"
 "want to render individual glyphs at precise locations, eg, a\n"
 "a glyph returned by load_char\n";
-;
+
 Py::Object
 FT2Font::draw_glyph_to_bitmap(const Py::Tuple & args) {
   _VERBOSE("FT2Font::draw_glyph_to_bitmap");
@@ -1768,7 +1767,7 @@ FT2Font::init_type() {
 
   behaviors().supportGetattr();
   behaviors().supportSetattr();
-};
+}
 
 //todo add module docs strings
 

Original file line number	Diff line number	Diff line change
`@@ -826,7 +826,7 @@ _image_module::from_images(const Py::Tuple& args) {`
`826`	`826`	`for (size_t i=0; i<thisim->colsOut; i++) {`
`827`	`827`	`thisx = i+ox;`
`828`	`828`	`thisy = j+oy;`
`829`		`- if (thisx<0 \|\| thisx>=numcols \|\| thisy<0 \|\| thisy>=numrows) {`
	`829`	`+ if (thisx>=numcols \|\| thisy>=numrows) {`
`830`	`830`	`ind +=4;`
`831`	`831`	`continue;`
`832`	`832`	`}`
-Original file line number
+Diff line change
 #else
 #  include <tk.h>
 #endif
 -};
 +}