Make norm argument to _image.resample a bool.

QuLogic · QuLogic · commit ff4ab66597ce · 2018-02-16T21:03:55.000-05:00
It only accepts a boolean on the Python side, but this is not enforced
on the C++ side. This causes many casting warnings since it's used
multiple times calling various filters that only take a `bool`.
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -412,7 +412,7 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                                 t,
                                 _interpd_[self.get_interpolation()],
                                 self.get_resample(), 1.0,
-                                self.get_filternorm() or 0.0,
+                                self.get_filternorm(),
                                 self.get_filterrad() or 0.0)
 
                 # we are done with A_scaled now, remove from namespace
@@ -447,7 +447,7 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                                 t,
                                 _interpd_[self.get_interpolation()],
                                 True, 1,
-                                self.get_filternorm() or 0.0,
+                                self.get_filternorm(),
                                 self.get_filterrad() or 0.0)
                 # we are done with the mask, delete from namespace to be sure!
                 del mask
@@ -481,7 +481,7 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                 _image.resample(
                     A, output, t, _interpd_[self.get_interpolation()],
                     self.get_resample(), alpha,
-                    self.get_filternorm() or 0.0, self.get_filterrad() or 0.0)
+                    self.get_filternorm(), self.get_filterrad() or 0.0)
 
             # at this point output is either a 2D array of normed data
             # (of int or float)
diff --git a/src/_image_resample.h b/src/_image_resample.h
@@ -800,7 +800,7 @@ struct resample_params_t {
     agg::trans_affine affine;
     const double *transform_mesh;
     bool resample;
-    double norm;
+    bool norm;
     double radius;
     double alpha;
 };
diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
@@ -14,7 +14,7 @@
  * */
 
 const char* image_resample__doc__ =
-"resample(input_array, output_array, matrix, interpolation=NEAREST, alpha=1.0, norm=0, radius=1)\n\n"
+"resample(input_array, output_array, matrix, interpolation=NEAREST, alpha=1.0, norm=False, radius=1)\n\n"
 
 "Resample input_array, blending it in-place into output_array, using an\n"
 "affine transformation.\n\n"
@@ -48,8 +48,8 @@ const char* image_resample__doc__ =
 "    The level of transparency to apply.  1.0 is completely opaque.\n"
 "    0.0 is completely transparent.\n\n"
 
-"norm : float, optional\n"
-"    The norm for the interpolation function.  Default is 0.\n\n"
+"norm : bool, optional\n"
+"    Whether to norm the interpolation function.  Default is `False`.\n\n"
 
 "radius: float, optional\n"
 "    The radius of the kernel, if method is SINC, LANCZOS or BLACKMAN.\n"
@@ -120,6 +120,7 @@ image_resample(PyObject *self, PyObject* args, PyObject *kwargs)
     PyObject *py_transform = NULL;
     resample_params_t params;
     int resample_;
+    int norm_;
 
     PyArrayObject *input_array = NULL;
     PyArrayObject *output_array = NULL;
@@ -132,9 +133,9 @@ image_resample(PyObject *self, PyObject* args, PyObject *kwargs)
         "resample", "alpha", "norm", "radius", NULL };
 
     if (!PyArg_ParseTupleAndKeywords(
-            args, kwargs, "OOO|iiddd:resample", (char **)kwlist,
+            args, kwargs, "OOO|iidid:resample", (char **)kwlist,
             &py_input_array, &py_output_array, &py_transform,
-            &params.interpolation, &resample_, &params.alpha, &params.norm,
+            &params.interpolation, &resample_, &params.alpha, &norm_,
             &params.radius)) {
         return NULL;
     }
@@ -146,6 +147,7 @@ image_resample(PyObject *self, PyObject* args, PyObject *kwargs)
     }
 
     params.resample = (resample_ != 0);
+    params.norm = (norm_ != 0);
 
     input_array = (PyArrayObject *)PyArray_FromAny(
         py_input_array, NULL, 2, 3, NPY_ARRAY_C_CONTIGUOUS, NULL);
