Merge pull request matplotlib#935 from idealisms/v1.1.x

V1.1.x branch, Fix a possible infinite loop by incrementing one of the variables used in the loop conditional.

Author: mdboom

src/_image.cpp

@@ -1039,8 +1039,7 @@ _image_module::fromarray2(const Py::Tuple& args)
         int rgba = A->dimensions[2] == 4;
         double r, g, b, alpha;
         const size_t N = imo->rowsIn * imo->colsIn;
-        size_t i = 0;
-        while (i < N)
+        for (size_t i = 0; i < N; ++i)
         {
             r = *(double *)(A->data++);
             g = *(double *)(A->data++);