diff --git a/src/aliceVision/image/image_test.cpp b/src/aliceVision/image/image_test.cpp index 8e8f8514aa..56068d9c94 100644 --- a/src/aliceVision/image/image_test.cpp +++ b/src/aliceVision/image/image_test.cpp @@ -26,12 +26,12 @@ BOOST_AUTO_TEST_CASE(Image_Basis) imaGray(2,2) = 2; imaGray(5,0) = 2; - //cout << imaGray << endl << endl; + cout << imaGray << endl << endl; //-- Get raw ptr to image data : const unsigned char * ptr = imaGray.data(); ((unsigned char*)ptr)[0] = 2; fill(((unsigned char*)ptr+9*10),((unsigned char*)ptr+10*10),2); - //cout << "After" << endl << imaGray; + cout << "After" << endl << imaGray; // Construction by re-copy Image imageGray2(imaGray); diff --git a/src/aliceVision/sfm/pipeline/panorama/panoramaSfM_test.cpp b/src/aliceVision/sfm/pipeline/panorama/panoramaSfM_test.cpp index b3fc9cdf1c..e5d2ae2d9d 100644 --- a/src/aliceVision/sfm/pipeline/panorama/panoramaSfM_test.cpp +++ b/src/aliceVision/sfm/pipeline/panorama/panoramaSfM_test.cpp @@ -157,16 +157,16 @@ void test_panorama(std::shared_ptr & intrinsic_gt, std::s BOOST_AUTO_TEST_CASE(PANORAMA_SFM_RADIAL3) { - std::shared_ptr intrinsic_gt = camera::createIntrinsic(camera::EINTRINSIC::PINHOLE_CAMERA_RADIAL3, 1920, 1080, 1357.0, 1357.0, 920, 560); - std::shared_ptr intrinsic_est = camera::createIntrinsic(camera::EINTRINSIC::PINHOLE_CAMERA_RADIAL3, 1920, 1080, 1200.0, 1200.0, 960, 540); + std::shared_ptr intrinsic_gt = camera::createIntrinsic(camera::EINTRINSIC::PINHOLE_CAMERA_RADIAL3, 1920, 1080, 1357.0, 1357.0, 0, 0); + std::shared_ptr intrinsic_est = camera::createIntrinsic(camera::EINTRINSIC::PINHOLE_CAMERA_RADIAL3, 1920, 1080, 1200.0, 1200.0, 40, -20); test_panorama(intrinsic_gt, intrinsic_est, 0.0); } BOOST_AUTO_TEST_CASE(PANORAMA_SFM_RADIAL3_OUTLIERS) { - std::shared_ptr intrinsic_gt = camera::createIntrinsic(camera::EINTRINSIC::PINHOLE_CAMERA_RADIAL3, 1920, 1080, 1357.0, 1357.0, 920, 560); - std::shared_ptr intrinsic_est = camera::createIntrinsic(camera::EINTRINSIC::PINHOLE_CAMERA_RADIAL3, 1920, 1080, 1000.0, 1000.0, 960, 540); + std::shared_ptr intrinsic_gt = camera::createIntrinsic(camera::EINTRINSIC::PINHOLE_CAMERA_RADIAL3, 1920, 1080, 1357.0, 1357.0, 0, 0); + std::shared_ptr intrinsic_est = camera::createIntrinsic(camera::EINTRINSIC::PINHOLE_CAMERA_RADIAL3, 1920, 1080, 1000.0, 1000.0, 40, -20); test_panorama(intrinsic_gt, intrinsic_est, 0.3); } @@ -174,16 +174,16 @@ BOOST_AUTO_TEST_CASE(PANORAMA_SFM_RADIAL3_OUTLIERS) BOOST_AUTO_TEST_CASE(PANORAMA_SFM_EQUIDISTANT) { - std::shared_ptr intrinsic_gt = camera::createIntrinsic(camera::EINTRINSIC::EQUIDISTANT_CAMERA_RADIAL3, 1920, 1080, 1357.0, 1357.0, 920, 560); - std::shared_ptr intrinsic_est = camera::createIntrinsic(camera::EINTRINSIC::EQUIDISTANT_CAMERA_RADIAL3, 1920, 1080, 1200.0, 1200.0, 960, 540); + std::shared_ptr intrinsic_gt = camera::createIntrinsic(camera::EINTRINSIC::EQUIDISTANT_CAMERA_RADIAL3, 1920, 1080, 1357.0, 1357.0, 0, 0); + std::shared_ptr intrinsic_est = camera::createIntrinsic(camera::EINTRINSIC::EQUIDISTANT_CAMERA_RADIAL3, 1920, 1080, 1200.0, 1200.0, 40, -20); test_panorama(intrinsic_gt, intrinsic_est, 0.0); } BOOST_AUTO_TEST_CASE(PANORAMA_SFM_EQUIDISTANT_OUTLIERS) { - std::shared_ptr intrinsic_gt = camera::createIntrinsic(camera::EINTRINSIC::EQUIDISTANT_CAMERA_RADIAL3, 1920, 1080, 1357.0, 1357.0, 920, 560); - std::shared_ptr intrinsic_est = camera::createIntrinsic(camera::EINTRINSIC::EQUIDISTANT_CAMERA_RADIAL3, 1920, 1080, 1000.0, 1000.0, 960, 540); + std::shared_ptr intrinsic_gt = camera::createIntrinsic(camera::EINTRINSIC::EQUIDISTANT_CAMERA_RADIAL3, 1920, 1080, 1357.0, 1357.0, 0, 0); + std::shared_ptr intrinsic_est = camera::createIntrinsic(camera::EINTRINSIC::EQUIDISTANT_CAMERA_RADIAL3, 1920, 1080, 1000.0, 1000.0, 40, -20); test_panorama(intrinsic_gt, intrinsic_est, 0.3); }