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

Merge pull request #3965 from Dikay900:2_4_diff_to_master_2

Browse Source
This commit is contained in:
Vadim Pisarevsky
2015-04-28 10:47:05 +00:00
parent ebe979090e 901d4995e3
commit 08848c56b7
11 changed files with 34 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
samples/cpp/Qt_sample/qt_opengl.cpp
View File

@@ -13,6 +13,9 @@
#ifdef __APPLE__
#include <OpenGL/gl.h>
#else
#if defined _MSC_VER && _MSC_VER >= 1600
#include <windows.h>
#endif
#include <GL/gl.h>
#endif

2
samples/cpp/freak_demo.cpp
View File

@@ -87,7 +87,7 @@ int main( int argc, char** argv ) {
// DESCRIPTOR
// Our proposed FREAK descriptor
// (roation invariance, scale invariance, pattern radius corresponding to SMALLEST_KP_SIZE,
// (rotation invariance, scale invariance, pattern radius corresponding to SMALLEST_KP_SIZE,
// number of octaves, optional vector containing the selected pairs)
// FREAK extractor(true, true, 22, 4, std::vector<int>());
FREAK extractor;

13
samples/cpp/stereo_match.cpp
View File

@@ -159,7 +159,18 @@ int main(int argc, char** argv)
Mat img1 = imread(img1_filename, color_mode);
Mat img2 = imread(img2_filename, color_mode);
if( scale != 1.f )
if (img1.empty())
{
printf("Command-line parameter error: could not load the first input image file\n");
return -1;
}
if (img2.empty())
{
printf("Command-line parameter error: could not load the second input image file\n");
return -1;
}
if (scale != 1.f)
{
Mat temp1, temp2;
int method = scale < 1 ? INTER_AREA : INTER_CUBIC;

2
samples/cpp/stitching_detailed.cpp
View File

@@ -516,7 +516,7 @@ int main(int argc, char* argv[])
{
vector<Mat> rmats;
for (size_t i = 0; i < cameras.size(); ++i)
rmats.push_back(cameras[i].R);
rmats.push_back(cameras[i].R.clone());
waveCorrect(rmats, wave_correct);
for (size_t i = 0; i < cameras.size(); ++i)
cameras[i].R = rmats[i];