Reverted BORDER_CONSTAT in stitcher.cpp

Resolves #7251
This commit is contained in:
Finfa811 2016-09-08 10:49:48 +02:00 committed by GitHub
parent c8d77fd961
commit fd1370b92b

View File

@ -192,7 +192,7 @@ Stitcher::Status Stitcher::composePanorama(InputArrayOfArrays images, OutputArra
K(1,1) *= (float)seam_work_aspect_; K(1,1) *= (float)seam_work_aspect_;
K(1,2) *= (float)seam_work_aspect_; K(1,2) *= (float)seam_work_aspect_;
corners[i] = w->warp(seam_est_imgs_[i], K, cameras_[i].R, INTER_LINEAR, BORDER_CONSTANT, images_warped[i]); corners[i] = w->warp(seam_est_imgs_[i], K, cameras_[i].R, INTER_LINEAR, BORDER_REFLECT, images_warped[i]);
sizes[i] = images_warped[i].size(); sizes[i] = images_warped[i].size();
w->warp(masks[i], K, cameras_[i].R, INTER_NEAREST, BORDER_CONSTANT, masks_warped[i]); w->warp(masks[i], K, cameras_[i].R, INTER_NEAREST, BORDER_CONSTANT, masks_warped[i]);
@ -298,7 +298,7 @@ Stitcher::Status Stitcher::composePanorama(InputArrayOfArrays images, OutputArra
int64 pt = getTickCount(); int64 pt = getTickCount();
#endif #endif
// Warp the current image // Warp the current image
w->warp(img, K, cameras_[img_idx].R, INTER_LINEAR, BORDER_CONSTANT, img_warped); w->warp(img, K, cameras_[img_idx].R, INTER_LINEAR, BORDER_REFLECT, img_warped);
LOGLN(" warp the current image: " << ((getTickCount() - pt) / getTickFrequency()) << " sec"); LOGLN(" warp the current image: " << ((getTickCount() - pt) / getTickFrequency()) << " sec");
#if ENABLE_LOG #if ENABLE_LOG
pt = getTickCount(); pt = getTickCount();