generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

switched float with short in blending step (opencv_stitching)

Browse Source
This commit is contained in:
Alexey Spizhevoy
2011-05-23 13:08:31 +00:00
parent 5bf8109dbc
commit f44632ee6f
4 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/stitching/main.cpp
View File

@@ -401,7 +401,6 @@ int main(int argc, char* argv[])
cameras[i].R, masks_warped[i], INTER_NEAREST, BORDER_CONSTANT);
}
// Convert to float for blending
vector<Mat> images_warped_f(num_images);
for (int i = 0; i < num_images; ++i)
images_warped[i].convertTo(images_warped_f[i], CV_32F);
@@ -426,7 +425,7 @@ int main(int argc, char* argv[])
LOGLN("Compositing...");
t = getTickCount();
Mat img_warped, img_warped_f;
Mat img_warped, img_warped_s;
Mat dilated_mask, seam_mask, mask, mask_warped;
Ptr<Blender> blender;
double compose_seam_aspect = 1;
@@ -461,7 +460,7 @@ int main(int argc, char* argv[])
// Warp the current image
warper->warp(img, static_cast<float>(cameras[img_idx].focal), cameras[img_idx].R,
img_warped);
img_warped.convertTo(img_warped_f, CV_32F);
img_warped.convertTo(img_warped_s, CV_16S);
img_warped.release();
img.release();
@@ -497,7 +496,7 @@ int main(int argc, char* argv[])
}
// Blend the current image
blender->feed(img_warped_f, mask_warped, corners[img_idx]);
blender->feed(img_warped_s, mask_warped, corners[img_idx]);
}
Mat result, result_mask;