modules/imgcodecs/include/opencv2/imgcodecs.hpp · a69fd6029afc489c153f661c7a92f72c3f0ae7e8 · submodule / opencv · GitLab

Blame History Permalink

Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan · a242556b
edgarriba authored Oct 31, 2015
```
Conflicts:
	modules/imgcodecs/include/opencv2/imgcodecs.hpp
```
a242556b

imgcodecs.hpp 14.2 KB