diff --git a/modules/adas/tools/fcw_detect/CMakeLists.txt b/modules/adas/tools/fcw_detect/CMakeLists.txt index b23e35fd6..604aec718 100644 --- a/modules/adas/tools/fcw_detect/CMakeLists.txt +++ b/modules/adas/tools/fcw_detect/CMakeLists.txt @@ -32,4 +32,4 @@ if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "applications") endif() -install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main) +install(TARGETS ${the_target} OPTIONAL RUNTIME DESTINATION bin COMPONENT main) diff --git a/modules/adas/tools/fcw_train/CMakeLists.txt b/modules/adas/tools/fcw_train/CMakeLists.txt index bdbc28939..f1cbecf7b 100644 --- a/modules/adas/tools/fcw_train/CMakeLists.txt +++ b/modules/adas/tools/fcw_train/CMakeLists.txt @@ -32,4 +32,4 @@ if(ENABLE_SOLUTION_FOLDERS) set_target_properties(${the_target} PROPERTIES FOLDER "applications") endif() -install(TARGETS ${the_target} RUNTIME DESTINATION bin COMPONENT main) +install(TARGETS ${the_target} OPTIONAL RUNTIME DESTINATION bin COMPONENT main) diff --git a/modules/bioinspired/src/retinacolor.hpp b/modules/bioinspired/src/retinacolor.hpp index ff7990638..2b50e6618 100644 --- a/modules/bioinspired/src/retinacolor.hpp +++ b/modules/bioinspired/src/retinacolor.hpp @@ -338,7 +338,7 @@ namespace bioinspired class Parallel_computeGradient: public cv::ParallelLoopBody { - private: + protected: float *imageGradient; const float *luminance; unsigned int nbColumns, doubleNbColumns, nbRows, nbPixels; diff --git a/modules/bioinspired/src/retinafilter.hpp b/modules/bioinspired/src/retinafilter.hpp index 5b254c8ac..057306bbe 100644 --- a/modules/bioinspired/src/retinafilter.hpp +++ b/modules/bioinspired/src/retinafilter.hpp @@ -503,7 +503,7 @@ public: inline unsigned int getOutputNBpixels() { return _photoreceptorsPrefilter.getNBpixels(); } -private: +protected: // processing activation flags bool _useParvoOutput; diff --git a/modules/contrib_world/CMakeLists.txt b/modules/contrib_world/CMakeLists.txt new file mode 100644 index 000000000..dafe6d5d6 --- /dev/null +++ b/modules/contrib_world/CMakeLists.txt @@ -0,0 +1,43 @@ +set(the_description "Separate world module containing all contrib modules") + +set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE) +set(BUILD_opencv_contrib_world_INIT OFF) # disabled by default + +# add new submodules to this list +set(OPENCV_MODULE_CHILDREN + bgsegm + bioinspired + ccalib + cvv + datasets + face + latentsvm + line_descriptor + optflow + reg + rgbd + saliency + surface_matching + text + tracking + xfeatures2d + ximgproc + xobjdetect + xphoto +) +ocv_list_add_prefix(OPENCV_MODULE_CHILDREN "opencv_") + +ocv_define_module(contrib_world) + +# ocv_add_module(contrib_world) + +# set(link_deps "") +# foreach(m ${OPENCV_MODULE_opencv_contrib_world_CHILDREN}) +# list(APPEND link_deps ${OPENCV_MODULE_${m}_LINK_DEPS}) +# endforeach() + +# +# ocv_glob_module_sources() +# ocv_module_include_directories() +# +# ocv_create_module(${link_deps}) diff --git a/modules/contrib_world/include/opencv2/contrib_world.hpp b/modules/contrib_world/include/opencv2/contrib_world.hpp new file mode 100644 index 000000000..2c1c4e25b --- /dev/null +++ b/modules/contrib_world/include/opencv2/contrib_world.hpp @@ -0,0 +1,5 @@ +#ifndef __OPENCV_CONTRIB_WORLD_HPP__ +#define __OPENCV_CONTRIB_WORLD_HPP__ + + +#endif diff --git a/modules/contrib_world/src/dummy.cpp b/modules/contrib_world/src/dummy.cpp new file mode 100644 index 000000000..a8f2cce0f --- /dev/null +++ b/modules/contrib_world/src/dummy.cpp @@ -0,0 +1 @@ +#include "opencv2/contrib_world.hpp" diff --git a/modules/datasets/src/ar_hmdb.cpp b/modules/datasets/src/ar_hmdb.cpp index 43a0aadb3..f4b42e33a 100644 --- a/modules/datasets/src/ar_hmdb.cpp +++ b/modules/datasets/src/ar_hmdb.cpp @@ -111,7 +111,7 @@ void AR_hmdbImp::loadDatasetSplit(const string &path, int number) if (itId == actionsId.end()) { actionsId.insert(make_pair(action, actionsId.size())); - id = actionsId.size(); + id = (int)actionsId.size(); } else { id = (*itId).second; diff --git a/modules/datasets/src/or_imagenet.cpp b/modules/datasets/src/or_imagenet.cpp index 05687b851..371ade1c5 100644 --- a/modules/datasets/src/or_imagenet.cpp +++ b/modules/datasets/src/or_imagenet.cpp @@ -129,7 +129,7 @@ void OR_imagenetImp::loadDataset(const string &path) { Ptr curr(new OR_imagenetObj); curr->id = atoi(line.c_str()); - numberToString(validation.back().size()+1, curr->image); + numberToString((int)validation.back().size()+1, curr->image); curr->image = "val/ILSVRC2010_val_" + curr->image + ".JPEG"; validation.back().push_back(curr); @@ -153,7 +153,7 @@ void OR_imagenetImp::loadDataset(const string &path) { Ptr curr(new OR_imagenetObj); curr->id = *it; - numberToString(test.back().size()+1, curr->image); + numberToString((int)test.back().size()+1, curr->image); curr->image = "test/ILSVRC2010_test_" + curr->image + ".JPEG"; test.back().push_back(curr); diff --git a/modules/datasets/src/or_sun.cpp b/modules/datasets/src/or_sun.cpp index 305eb2177..2413fc05b 100644 --- a/modules/datasets/src/or_sun.cpp +++ b/modules/datasets/src/or_sun.cpp @@ -98,7 +98,7 @@ void OR_sunImp::loadDatasetPart(const string &path, vector< Ptr > &datas curr->label = (*it).second; } else { - curr->label = pathLabel.size(); + curr->label = (int)pathLabel.size(); pathLabel.insert(make_pair(labelStr, curr->label)); paths.push_back(labelStr); } diff --git a/modules/line_descriptor/src/binary_descriptor.cpp b/modules/line_descriptor/src/binary_descriptor.cpp index 5ea1313f2..2d2929f9c 100644 --- a/modules/line_descriptor/src/binary_descriptor.cpp +++ b/modules/line_descriptor/src/binary_descriptor.cpp @@ -570,7 +570,7 @@ void BinaryDescriptor::computeImpl( const Mat& imageSrc, std::vector& k /* create a map to record association between KeyLines and their position in ScaleLines vector */ - std::map, int> correspondences; + std::map, size_t> correspondences; /* fill ScaleLines object */ for ( size_t slCounter = 0; slCounter < keylines.size(); slCounter++ ) @@ -601,7 +601,7 @@ void BinaryDescriptor::computeImpl( const Mat& imageSrc, std::vector& k /* update map */ int id = kl.class_id; int oct = kl.octave; - correspondences.insert( std::pair, int>( std::pair( id, oct ), slCounter ) ); + correspondences.insert( std::pair, size_t>( std::pair( id, oct ), slCounter ) ); } /* delete useless OctaveSingleLines */ @@ -632,7 +632,7 @@ void BinaryDescriptor::computeImpl( const Mat& imageSrc, std::vector& k { /* get original index of keypoint */ int lineOctave = ( sl[k][lineC] ).octaveCount; - int originalIndex = correspondences.find( std::pair( k, lineOctave ) )->second; + int originalIndex = (int)correspondences.find( std::pair( k, lineOctave ) )->second; if( !returnFloatDescr ) { diff --git a/modules/surface_matching/src/icp.cpp b/modules/surface_matching/src/icp.cpp index 8614ed521..a5dd5708a 100644 --- a/modules/surface_matching/src/icp.cpp +++ b/modules/surface_matching/src/icp.cpp @@ -425,9 +425,9 @@ int ICP::registerModelToScene(const Mat& srcPC, const Mat& dstPC, double& residu if (node) { // select the first node - int idx = reinterpret_cast(node->data)-1, dn=0; + long idx = reinterpret_cast(node->data)-1, dn=0; int dup = (int)node->key-1; - int minIdxD = idx; + long minIdxD = idx; float minDist = distances[idx]; while ( node ) diff --git a/modules/text/src/erfilter.cpp b/modules/text/src/erfilter.cpp index bc269f8cf..8237c9c77 100644 --- a/modules/text/src/erfilter.cpp +++ b/modules/text/src/erfilter.cpp @@ -1998,7 +1998,7 @@ enum { computation. */ class dissimilarity { -private: +protected: double * Xa; auto_array_ptr Xnew; ptrdiff_t dim; // size_t saves many statis_cast<> in products diff --git a/modules/xphoto/src/dct_image_denoising.cpp b/modules/xphoto/src/dct_image_denoising.cpp index 6afa1ccb9..89e8af017 100644 --- a/modules/xphoto/src/dct_image_denoising.cpp +++ b/modules/xphoto/src/dct_image_denoising.cpp @@ -70,7 +70,7 @@ namespace xphoto void operator() (const Range &range) const; - private: + protected: const Mat &src; std::vector &patches; // image decomposition into sliding patches @@ -182,4 +182,4 @@ namespace xphoto } } -} \ No newline at end of file +}