Fix for imshow multiple definition error lava#48

pm-twice · lava · commit d3137c53b164 · 2019-10-25T02:27:10.000+02:00
When multiple files include matplotlibcpp.h
and another file load these files in the same time,
compile error of multiple definition in imshow occurs.
This fix add inline modifier to imshow().
diff --git a/matplotlibcpp.h b/matplotlibcpp.h
@@ -579,7 +579,7 @@ bool hist(const std::vector<Numeric>& y, long bins=10,std::string color="b",
 
 #ifndef WITHOUT_NUMPY
     namespace internal {
-        void imshow(void *ptr, const NPY_TYPES type, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords)
+        inline void imshow(void *ptr, const NPY_TYPES type, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords)
         {
             assert(type == NPY_UINT8 || type == NPY_FLOAT);
             assert(colors == 1 || colors == 3 || colors == 4);
@@ -607,12 +607,12 @@ bool hist(const std::vector<Numeric>& y, long bins=10,std::string color="b",
         }
     }
 
-    void imshow(const unsigned char *ptr, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords = {})
+    inline void imshow(const unsigned char *ptr, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords = {})
     {
         internal::imshow((void *) ptr, NPY_UINT8, rows, columns, colors, keywords);
     }
 
-    void imshow(const float *ptr, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords = {})
+    inline void imshow(const float *ptr, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords = {})
     {
         internal::imshow((void *) ptr, NPY_FLOAT, rows, columns, colors, keywords);
     }

Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,7 @@ bool hist(const std::vector<Numeric>& y, long bins=10,std::string color="b",`
`579`	`579`
`580`	`580`	`#ifndef WITHOUT_NUMPY`
`581`	`581`	`namespace internal {`
`582`		`- void imshow(void *ptr, const NPY_TYPES type, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords)`
	`582`	`+ inline void imshow(void *ptr, const NPY_TYPES type, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords)`
`583`	`583`	`{`
`584`	`584`	`assert(type == NPY_UINT8 \|\| type == NPY_FLOAT);`
`585`	`585`	`assert(colors == 1 \|\| colors == 3 \|\| colors == 4);`
`@@ -607,12 +607,12 @@ bool hist(const std::vector<Numeric>& y, long bins=10,std::string color="b",`
`607`	`607`	`}`
`608`	`608`	`}`
`609`	`609`
`610`		`- void imshow(const unsigned char *ptr, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords = {})`
	`610`	`+ inline void imshow(const unsigned char *ptr, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords = {})`
`611`	`611`	`{`
`612`	`612`	`internal::imshow((void *) ptr, NPY_UINT8, rows, columns, colors, keywords);`
`613`	`613`	`}`
`614`	`614`
`615`		`- void imshow(const float *ptr, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords = {})`
	`615`	`+ inline void imshow(const float *ptr, const int rows, const int columns, const int colors, const std::map<std::string, std::string> &keywords = {})`
`616`	`616`	`{`
`617`	`617`	`internal::imshow((void *) ptr, NPY_FLOAT, rows, columns, colors, keywords);`
`618`	`618`	`}`