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

Fixed MSVC 2013 build errors and workaround for an internal compiler crash.

Browse Source
This commit is contained in:
Jose-Luis Blanco-Claraco 2013-10-20 17:28:45 +02:00
parent 4c102112dd
commit 52a904e17b
8 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
3rdparty/openexr/IlmImf/ImfAcesFile.cpp vendored
View File

@ -42,6 +42,7 @@
#include <ImfRgbaFile.h> #include <ImfRgbaFile.h>
#include <ImfStandardAttributes.h> #include <ImfStandardAttributes.h>
#include <Iex.h> #include <Iex.h>
#include <algorithm> // for std::max()
using namespace std; using namespace std;
using namespace Imath; using namespace Imath;

1
3rdparty/openexr/IlmImf/ImfOutputFile.cpp vendored
View File

@ -58,6 +58,7 @@
#include <vector> #include <vector>
#include <fstream> #include <fstream>
#include <assert.h> #include <assert.h>
#include <algorithm> // for std::max()
namespace Imf { namespace Imf {

1
3rdparty/openexr/IlmImf/ImfScanLineInputFile.cpp vendored
View File

@ -56,6 +56,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include <assert.h> #include <assert.h>
#include <algorithm> // for std::max()
namespace Imf { namespace Imf {

1
3rdparty/openexr/IlmImf/ImfTiledMisc.cpp vendored
View File

@ -43,6 +43,7 @@
#include "Iex.h" #include "Iex.h"
#include <ImfMisc.h> #include <ImfMisc.h>
#include <ImfChannelList.h> #include <ImfChannelList.h>
#include <algorithm> // for std::max()
namespace Imf { namespace Imf {

1
3rdparty/openexr/IlmImf/ImfTiledOutputFile.cpp vendored
View File

@ -63,6 +63,7 @@
#include <fstream> #include <fstream>
#include <assert.h> #include <assert.h>
#include <map> #include <map>
#include <algorithm> // for std::max()
namespace Imf { namespace Imf {

1
3rdparty/openexr/Imath/ImathMatrixAlgo.cpp vendored
View File

@ -44,6 +44,7 @@
#include "ImathMatrixAlgo.h" #include "ImathMatrixAlgo.h"
#include <cmath> #include <cmath>
#include <algorithm> // for std::max()
#if defined(OPENEXR_DLL) #if defined(OPENEXR_DLL)
#define EXPORT_CONST __declspec(dllexport) #define EXPORT_CONST __declspec(dllexport)

2
modules/features2d/src/features2d_init.cpp
View File

@ -176,7 +176,7 @@ CV_INIT_ALGORITHM(DenseFeatureDetector, "Feature2D.Dense",
obj.info()->addParam(obj, "varyImgBoundWithScale", obj.varyImgBoundWithScale)); obj.info()->addParam(obj, "varyImgBoundWithScale", obj.varyImgBoundWithScale));
CV_INIT_ALGORITHM(GridAdaptedFeatureDetector, "Feature2D.Grid", CV_INIT_ALGORITHM(GridAdaptedFeatureDetector, "Feature2D.Grid",
obj.info()->addParam(obj, "detector", obj.detector); obj.info()->addParam<FeatureDetector>(obj, "detector", obj.detector, false, 0, 0, "Detector algorithm.");
obj.info()->addParam(obj, "maxTotalKeypoints", obj.maxTotalKeypoints); obj.info()->addParam(obj, "maxTotalKeypoints", obj.maxTotalKeypoints);
obj.info()->addParam(obj, "gridRows", obj.gridRows); obj.info()->addParam(obj, "gridRows", obj.gridRows);
obj.info()->addParam(obj, "gridCols", obj.gridCols)); obj.info()->addParam(obj, "gridCols", obj.gridCols));

13
modules/features2d/src/orb.cpp
View File

@ -139,9 +139,14 @@ static void computeOrbDescriptor(const KeyPoint& kpt,
int step = (int)img.step; int step = (int)img.step;
#if 1 #if 1
#define GET_VALUE(idx) \ float x, y;
center[cvRound(pattern[idx].x*b + pattern[idx].y*a)*step + \ int ix, iy;
cvRound(pattern[idx].x*a - pattern[idx].y*b)] #define GET_VALUE(idx) \
(x = pattern[idx].x*a - pattern[idx].y*b, \
y = pattern[idx].x*b + pattern[idx].y*a, \
ix = cvRound(x), \
iy = cvRound(y), \
*(center + iy*step + ix) )
#else #else
float x, y; float x, y;
int ix, iy; int ix, iy;
@ -935,7 +940,7 @@ void ORB::operator()( InputArray _image, InputArray _mask, std::vector<KeyPoint>
} }
} }
void ORB::detectImpl( const Mat& image, std::vector<KeyPoint>& keypoints, const Mat& mask) const void ORB::detectImpl(const Mat& image, std::vector<KeyPoint>& keypoints, const Mat& mask) const
{ {
(*this)(image, mask, keypoints, noArray(), false); (*this)(image, mask, keypoints, noArray(), false);
} }