|
|
|
@ -73,9 +73,9 @@ static void showDifference(const Mat& image1, const Mat& image2, const char* tit |
|
|
|
|
image1.convertTo(img1, CV_32FC3); |
|
|
|
|
image2.convertTo(img2, CV_32FC3); |
|
|
|
|
if(img1.channels() != 1) |
|
|
|
|
cvtColor(img1, img1, CV_RGB2GRAY); |
|
|
|
|
cvtColor(img1, img1, COLOR_BGR2GRAY); |
|
|
|
|
if(img2.channels() != 1) |
|
|
|
|
cvtColor(img2, img2, CV_RGB2GRAY); |
|
|
|
|
cvtColor(img2, img2, COLOR_BGR2GRAY); |
|
|
|
|
|
|
|
|
|
Mat imgDiff; |
|
|
|
|
img1.copyTo(imgDiff); |
|
|
|
@ -273,11 +273,11 @@ static void calcHomographyFeature(const Mat& image1, const Mat& image2) |
|
|
|
|
Mat gray_image2; |
|
|
|
|
// Convert to Grayscale
|
|
|
|
|
if(image1.channels() != 1) |
|
|
|
|
cvtColor(image1, gray_image1, CV_RGB2GRAY); |
|
|
|
|
cvtColor(image1, gray_image1, COLOR_BGR2GRAY); |
|
|
|
|
else |
|
|
|
|
image1.copyTo(gray_image1); |
|
|
|
|
if(image2.channels() != 1) |
|
|
|
|
cvtColor(image2, gray_image2, CV_RGB2GRAY); |
|
|
|
|
cvtColor(image2, gray_image2, COLOR_BGR2GRAY); |
|
|
|
|
else |
|
|
|
|
image2.copyTo(gray_image2); |
|
|
|
|
|
|
|
|
@ -335,7 +335,7 @@ static void calcHomographyFeature(const Mat& image1, const Mat& image2) |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// Find the Homography Matrix
|
|
|
|
|
Mat H = findHomography( obj, scene, CV_RANSAC ); |
|
|
|
|
Mat H = findHomography( obj, scene, RANSAC ); |
|
|
|
|
// Use the Homography Matrix to warp the images
|
|
|
|
|
Mat result; |
|
|
|
|
Mat Hinv = H.inv(); |
|
|
|
@ -393,7 +393,7 @@ static void comparePixelVsFeature(const Mat& img1_8b, const Mat& img2_8b) |
|
|
|
|
int main(void) |
|
|
|
|
{ |
|
|
|
|
Mat img1; |
|
|
|
|
img1 = imread("home.png", CV_LOAD_IMAGE_UNCHANGED); |
|
|
|
|
img1 = imread("home.png", IMREAD_UNCHANGED); |
|
|
|
|
if(!img1.data) { |
|
|
|
|
cout << "Could not open or find file" << endl; |
|
|
|
|
return -1; |
|
|
|
@ -408,13 +408,13 @@ int main(void) |
|
|
|
|
testProjective(img1); |
|
|
|
|
|
|
|
|
|
#ifdef COMPARE_FEATURES |
|
|
|
|
Mat imgcmp1 = imread("LR_05.png", CV_LOAD_IMAGE_UNCHANGED); |
|
|
|
|
Mat imgcmp1 = imread("LR_05.png", IMREAD_UNCHANGED); |
|
|
|
|
if(!imgcmp1.data) { |
|
|
|
|
cout << "Could not open or find file" << endl; |
|
|
|
|
return -1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Mat imgcmp2 = imread("LR_06.png", CV_LOAD_IMAGE_UNCHANGED); |
|
|
|
|
Mat imgcmp2 = imread("LR_06.png", IMREAD_UNCHANGED); |
|
|
|
|
if(!imgcmp2.data) { |
|
|
|
|
cout << "Could not open or find file" << endl; |
|
|
|
|
return -1; |
|
|
|
|