Make highgui.hpp independent from C API

This commit is contained in:
Andrey Kamaev
2013-04-07 22:45:38 +04:00
parent 288a0634c2
commit 0738ea7d0f
152 changed files with 899 additions and 594 deletions

View File

@@ -33,12 +33,12 @@ int main(int argc, char* argv[])
{
if (string(argv[i]) == "--left")
{
img1.upload(imread(argv[++i], CV_LOAD_IMAGE_GRAYSCALE));
img1.upload(imread(argv[++i], IMREAD_GRAYSCALE));
CV_Assert(!img1.empty());
}
else if (string(argv[i]) == "--right")
{
img2.upload(imread(argv[++i], CV_LOAD_IMAGE_GRAYSCALE));
img2.upload(imread(argv[++i], IMREAD_GRAYSCALE));
CV_Assert(!img2.empty());
}
else if (string(argv[i]) == "--help")