Added OpenCV 3 support

This commit is contained in:
matlabbe
2015-06-18 23:00:46 -04:00
parent aa4005b266
commit 6fe1e42181
17 changed files with 450 additions and 253 deletions
+1 -1
View File
@@ -104,7 +104,7 @@ int main(int argc, char * argv[])
{
CvSize sizeA = cvGetSize(imageA);
CvSize sizeB = cvGetSize(imageB);
CvSize targetSize = {0};
CvSize targetSize = cvSize(0,0);
targetSize.width = sizeA.width + sizeB.width;
targetSize.height = sizeA.height > sizeB.height ? sizeA.height : sizeB.height;
IplImage* targetImage = cvCreateImage(targetSize, imageA->depth, imageA->nChannels);