Merge pull request #2 from kfish/warnings

kfish · web-flow · commit dd3848333771 · 2023-10-27T09:19:29.000+11:00
Fix compile warnings
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
@@ -457,8 +457,8 @@ template <typename Matrix> PyObject *get_2darray(const Matrix &A) {
 
   double *vd_begin = static_cast<double *>(PyArray_DATA(varray));
 
-  for (std::size_t i = 0; i < A.rows(); ++i) {
-    for (std::size_t j = 0; j < A.cols(); ++j) {
+  for (ssize_t i = 0; i < A.rows(); ++i) {
+    for (ssize_t j = 0; j < A.cols(); ++j) {
       *(vd_begin + i * A.cols() + j) = A(i, j);
     }
   }
@@ -550,10 +550,10 @@ bool plot(const VectorY &y, const std::string &format = "",
   // Note: cannot be an unsigned type for some reason, yields an overflow
   // problem..
   std::vector<int> x(y.size());
-  for (int i = 0; i < x.size(); ++i)
+  for (size_t i = 0; i < x.size(); ++i)
     x.at(i) = i;
 
-  return plot(x, y, format);
+  return plot(x, y, format, keywords);
 }
 
 // @brief standard plot function if x data is not specified and the formatting

Original file line number	Diff line number	Diff line change
`@@ -457,8 +457,8 @@ template <typename Matrix> PyObject *get_2darray(const Matrix &A) {`
`457`	`457`
`458`	`458`	`double vd_begin = static_cast<double >(PyArray_DATA(varray));`
`459`	`459`
`460`		`- for (std::size_t i = 0; i < A.rows(); ++i) {`
`461`		`- for (std::size_t j = 0; j < A.cols(); ++j) {`
	`460`	`+ for (ssize_t i = 0; i < A.rows(); ++i) {`
	`461`	`+ for (ssize_t j = 0; j < A.cols(); ++j) {`
`462`	`462`	`(vd_begin + i A.cols() + j) = A(i, j);`
`463`	`463`	`}`
`464`	`464`	`}`
`@@ -550,10 +550,10 @@ bool plot(const VectorY &y, const std::string &format = "",`
`550`	`550`	`// Note: cannot be an unsigned type for some reason, yields an overflow`
`551`	`551`	`// problem..`
`552`	`552`	`std::vector<int> x(y.size());`
`553`		`- for (int i = 0; i < x.size(); ++i)`
	`553`	`+ for (size_t i = 0; i < x.size(); ++i)`
`554`	`554`	`x.at(i) = i;`
`555`	`555`
`556`		`- return plot(x, y, format);`
	`556`	`+ return plot(x, y, format, keywords);`
`557`	`557`	`}`
`558`	`558`
`559`	`559`	`// @brief standard plot function if x data is not specified and the formatting`