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

Fixed iOS framework compilation warnings

Browse Source
This commit is contained in:
Maksim Shabunin
2014-10-20 16:06:32 +04:00
parent b59aaae2dc
commit 09fb7512ed
35 changed files with 121 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/include/opencv2/stitching/detail/matchers.hpp
View File

@@ -122,8 +122,10 @@ private:
gpu::SURF_GPU surf_;
gpu::GpuMat keypoints_;
gpu::GpuMat descriptors_;
#if defined(HAVE_OPENCV_GPU) && !defined(DYNAMIC_CUDA_SUPPORT)
int num_octaves_, num_layers_;
int num_octaves_descr_, num_layers_descr_;
#endif
};
#endif

14
modules/stitching/include/opencv2/stitching/detail/seam_finders.hpp
View File

@@ -232,8 +232,16 @@ class CV_EXPORTS GraphCutSeamFinderGpu : public GraphCutSeamFinderBase, public P
public:
GraphCutSeamFinderGpu(int cost_type = COST_COLOR_GRAD, float terminal_cost = 10000.f,
float bad_region_penalty = 1000.f)
: cost_type_(cost_type), terminal_cost_(terminal_cost),
bad_region_penalty_(bad_region_penalty) {}
#if defined(HAVE_OPENCV_GPU) && !defined(DYNAMIC_CUDA_SUPPORT)
: cost_type_(cost_type),
terminal_cost_(terminal_cost),
bad_region_penalty_(bad_region_penalty)
#endif
{
(void)cost_type;
(void)terminal_cost;
(void)bad_region_penalty;
}
void find(const std::vector<cv::Mat> &src, const std::vector<cv::Point> &corners,
std::vector<cv::Mat> &masks);
@@ -246,9 +254,11 @@ private:
const cv::Mat &dy1, const cv::Mat &dy2, const cv::Mat &mask1, const cv::Mat &mask2,
cv::Mat &terminals, cv::Mat &leftT, cv::Mat &rightT, cv::Mat &top, cv::Mat &bottom);
std::vector<Mat> dx_, dy_;
#if defined(HAVE_OPENCV_GPU) && !defined(DYNAMIC_CUDA_SUPPORT)
int cost_type_;
float terminal_cost_;
float bad_region_penalty_;
#endif
};
} // namespace detail