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

Highgui tests for GUI disabled for WinRT;

Browse Source 
Warnings fix;
This commit is contained in:
Alexander Smorkalov 2013-03-21 16:18:19 +04:00
parent 429cd85b46
commit 7ec2b6bad0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/highgui/test/test_gui.cpp
View File

@ -43,7 +43,7 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
#if defined HAVE_GTK || defined HAVE_QT || defined WIN32 || defined _WIN32 || defined HAVE_CARBON || defined HAVE_COCOA #if defined HAVE_GTK || defined HAVE_QT || ((defined WIN32 || defined _WIN32) && !_M_ARM) || defined HAVE_CARBON || defined HAVE_COCOA
using namespace cv; using namespace cv;
using namespace std; using namespace std;

6
modules/stitching/include/opencv2/stitching/detail/warpers.hpp
View File

@ -460,7 +460,7 @@ struct SphericalPortraitProjector : ProjectorBase
// Projects image onto unit sphere with origin at (0, 0, 0). // Projects image onto unit sphere with origin at (0, 0, 0).
// Poles are located NOT at (0, -1, 0) and (0, 1, 0) points, BUT at (1, 0, 0) and (-1, 0, 0) points. // Poles are located NOT at (0, -1, 0) and (0, 1, 0) points, BUT at (1, 0, 0) and (-1, 0, 0) points.
class SphericalPortraitWarper : public RotationWarperBase<SphericalPortraitProjector> class CV_EXPORTS SphericalPortraitWarper : public RotationWarperBase<SphericalPortraitProjector>
{ {
public: public:
SphericalPortraitWarper(float scale) { projector_.scale = scale; } SphericalPortraitWarper(float scale) { projector_.scale = scale; }
@ -476,7 +476,7 @@ struct CylindricalPortraitProjector : ProjectorBase
}; };
class CylindricalPortraitWarper : public RotationWarperBase<CylindricalPortraitProjector> class CV_EXPORTS CylindricalPortraitWarper : public RotationWarperBase<CylindricalPortraitProjector>
{ {
public: public:
CylindricalPortraitWarper(float scale) { projector_.scale = scale; } CylindricalPortraitWarper(float scale) { projector_.scale = scale; }
@ -495,7 +495,7 @@ struct PlanePortraitProjector : ProjectorBase
}; };
class PlanePortraitWarper : public RotationWarperBase<PlanePortraitProjector> class CV_EXPORTS PlanePortraitWarper : public RotationWarperBase<PlanePortraitProjector>
{ {
public: public:
PlanePortraitWarper(float scale) { projector_.scale = scale; } PlanePortraitWarper(float scale) { projector_.scale = scale; }