Skip to content

Commit 45cbc51

Browse files
alalekalalek
committed
build: fix viz tests
removed test_precomp.cpp
1 parent ef2e5a9 commit 45cbc51

File tree

3 files changed

+93
-87
lines changed

3 files changed

+93
-87
lines changed

‎modules/viz/test/test_precomp.cpp renamed to ‎modules/viz/test/test_common.cpp

File renamed without changes.

‎modules/viz/test/test_common.hpp

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
/*M///////////////////////////////////////////////////////////////////////////////////////
2+
//
3+
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
4+
//
5+
// By downloading, copying, installing or using the software you agree to this license.
6+
// If you do not agree to this license, do not download, install,
7+
// copy or use the software.
8+
//
9+
//
10+
// License Agreement
11+
// For Open Source Computer Vision Library
12+
//
13+
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
14+
// Third party copyrights are property of their respective owners.
15+
//
16+
// Redistribution and use in source and binary forms, with or without modification,
17+
// are permitted provided that the following conditions are met:
18+
//
19+
// * Redistribution's of source code must retain the above copyright notice,
20+
// this list of conditions and the following disclaimer.
21+
//
22+
// * Redistribution's in binary form must reproduce the above copyright notice,
23+
// this list of conditions and the following disclaimer in the documentation
24+
// and/or other materials provided with the distribution.
25+
//
26+
// * The name of the copyright holders may not be used to endorse or promote products
27+
// derived from this software without specific prior written permission.
28+
//
29+
// This software is provided by the copyright holders and contributors "as is" and
30+
// any express or implied warranties, including, but not limited to, the implied
31+
// warranties of merchantability and fitness for a particular purpose are disclaimed.
32+
// In no event shall the Intel Corporation or contributors be liable for any direct,
33+
// indirect, incidental, special, exemplary, or consequential damages
34+
// (including, but not limited to, procurement of substitute goods or services;
35+
// loss of use, data, or profits; or business interruption) however caused
36+
// and on any theory of liability, whether in contract, strict liability,
37+
// or tort (including negligence or otherwise) arising in any way out of
38+
// the use of this software, even if advised of the possibility of such damage.
39+
//
40+
// Authors:
41+
// * Ozan Tonkal, ozantonkal@gmail.com
42+
// * Anatoly Baksheev, Itseez Inc. myname.mysurname <> mycompany.com
43+
//
44+
//M*/
45+
46+
#ifndef OPENCV_VIZ_TEST_COMMON_HPP
47+
#define OPENCV_VIZ_TEST_COMMON_HPP
48+
49+
#include <opencv2/viz/vizcore.hpp>
50+
51+
#include <iostream>
52+
#include <fstream>
53+
#include <string>
54+
#include <limits>
55+
56+
namespace cv
57+
{
58+
struct Path
59+
{
60+
static String combine(const String& item1, const String& item2);
61+
static String combine(const String& item1, const String& item2, const String& item3);
62+
static String change_extension(const String& file, const String& ext);
63+
};
64+
65+
inline cv::String get_dragon_ply_file_path()
66+
{
67+
return Path::combine(cvtest::TS::ptr()->get_data_path(), "dragon.ply");
68+
}
69+
70+
template<typename _Tp>
71+
inline std::vector< Affine3<_Tp> > generate_test_trajectory()
72+
{
73+
std::vector< Affine3<_Tp> > result;
74+
75+
for (int i = 0, j = 0; i <= 270; i += 3, j += 10)
76+
{
77+
double x = 2 * cos(i * 3 * CV_PI/180.0) * (1.0 + 0.5 * cos(1.2 + i * 1.2 * CV_PI/180.0));
78+
double y = 0.25 + i/270.0 + sin(j * CV_PI/180.0) * 0.2 * sin(0.6 + j * 1.5 * CV_PI/180.0);
79+
double z = 2 * sin(i * 3 * CV_PI/180.0) * (1.0 + 0.5 * cos(1.2 + i * CV_PI/180.0));
80+
result.push_back(viz::makeCameraPose(Vec3d(x, y, z), Vec3d::all(0.0), Vec3d(0.0, 1.0, 0.0)));
81+
}
82+
return result;
83+
}
84+
85+
inline Mat make_gray(const Mat& image)
86+
{
87+
Mat chs[3]; split(image, chs);
88+
return 0.114 * chs[0] + 0.58 * chs[1] + 0.3 * chs[2];
89+
}
90+
}
91+
92+
#endif

‎modules/viz/test/test_precomp.hpp

Lines changed: 1 addition & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -1,88 +1,2 @@
1-
/*M///////////////////////////////////////////////////////////////////////////////////////
2-
//
3-
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
4-
//
5-
// By downloading, copying, installing or using the software you agree to this license.
6-
// If you do not agree to this license, do not download, install,
7-
// copy or use the software.
8-
//
9-
//
10-
// License Agreement
11-
// For Open Source Computer Vision Library
12-
//
13-
// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
14-
// Third party copyrights are property of their respective owners.
15-
//
16-
// Redistribution and use in source and binary forms, with or without modification,
17-
// are permitted provided that the following conditions are met:
18-
//
19-
// * Redistribution's of source code must retain the above copyright notice,
20-
// this list of conditions and the following disclaimer.
21-
//
22-
// * Redistribution's in binary form must reproduce the above copyright notice,
23-
// this list of conditions and the following disclaimer in the documentation
24-
// and/or other materials provided with the distribution.
25-
//
26-
// * The name of the copyright holders may not be used to endorse or promote products
27-
// derived from this software without specific prior written permission.
28-
//
29-
// This software is provided by the copyright holders and contributors "as is" and
30-
// any express or implied warranties, including, but not limited to, the implied
31-
// warranties of merchantability and fitness for a particular purpose are disclaimed.
32-
// In no event shall the Intel Corporation or contributors be liable for any direct,
33-
// indirect, incidental, special, exemplary, or consequential damages
34-
// (including, but not limited to, procurement of substitute goods or services;
35-
// loss of use, data, or profits; or business interruption) however caused
36-
// and on any theory of liability, whether in contract, strict liability,
37-
// or tort (including negligence or otherwise) arising in any way out of
38-
// the use of this software, even if advised of the possibility of such damage.
39-
//
40-
// Authors:
41-
// * Ozan Tonkal, ozantonkal@gmail.com
42-
// * Anatoly Baksheev, Itseez Inc. myname.mysurname <> mycompany.com
43-
//
44-
//M*/
451
#include "opencv2/ts.hpp"
46-
47-
#include <opencv2/viz/vizcore.hpp>
48-
49-
#include <iostream>
50-
#include <fstream>
51-
#include <string>
52-
#include <limits>
53-
54-
namespace cv
55-
{
56-
struct Path
57-
{
58-
static String combine(const String& item1, const String& item2);
59-
static String combine(const String& item1, const String& item2, const String& item3);
60-
static String change_extension(const String& file, const String& ext);
61-
};
62-
63-
inline cv::String get_dragon_ply_file_path()
64-
{
65-
return Path::combine(cvtest::TS::ptr()->get_data_path(), "dragon.ply");
66-
}
67-
68-
template<typename _Tp>
69-
inline std::vector< Affine3<_Tp> > generate_test_trajectory()
70-
{
71-
std::vector< Affine3<_Tp> > result;
72-
73-
for (int i = 0, j = 0; i <= 270; i += 3, j += 10)
74-
{
75-
double x = 2 * cos(i * 3 * CV_PI/180.0) * (1.0 + 0.5 * cos(1.2 + i * 1.2 * CV_PI/180.0));
76-
double y = 0.25 + i/270.0 + sin(j * CV_PI/180.0) * 0.2 * sin(0.6 + j * 1.5 * CV_PI/180.0);
77-
double z = 2 * sin(i * 3 * CV_PI/180.0) * (1.0 + 0.5 * cos(1.2 + i * CV_PI/180.0));
78-
result.push_back(viz::makeCameraPose(Vec3d(x, y, z), Vec3d::all(0.0), Vec3d(0.0, 1.0, 0.0)));
79-
}
80-
return result;
81-
}
82-
83-
inline Mat make_gray(const Mat& image)
84-
{
85-
Mat chs[3]; split(image, chs);
86-
return 0.114 * chs[0] + 0.58 * chs[1] + 0.3 * chs[2];
87-
}
88-
}
2+
#include "test_common.hpp"

0 commit comments

Comments
 (0)