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

Fix casting from/to int/float that caused lot of compiler warnings.

Browse Source
This commit is contained in:
Ievgen Khvedchenia
2014-04-28 15:00:14 +03:00
parent 61f79c2632
commit f97e38d8a6
6 changed files with 582 additions and 562 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/features2d/src/akaze.cpp
View File

@@ -30,12 +30,12 @@ namespace cv
if (descriptor_size == 0) if (descriptor_size == 0)
{ {
int t = (6 + 36 + 120) * descriptor_channels; int t = (6 + 36 + 120) * descriptor_channels;
return ceil(t / 8.); return (int)ceil(t / 8.);
} }
else else
{ {
// We use the random bit selection length binary descriptor // We use the random bit selection length binary descriptor
return ceil(descriptor_size / 8.); return (int)ceil(descriptor_size / 8.);
} }
} }
} }

651
modules/features2d/src/akaze/AKAZE.cpp
View File

File diff suppressed because it is too large Load Diff

15
modules/features2d/src/akaze/AKAZE.h
View File

@@ -33,9 +33,6 @@ private:
cv::Mat descriptorBits_; cv::Mat descriptorBits_;
cv::Mat bitMask_; cv::Mat bitMask_;
/// Computation times variables in ms
AKAZETiming timing_;
public: public:
/// Constructor with input arguments /// Constructor with input arguments
@@ -74,14 +71,14 @@ public:
//void Get_MLDB_Descriptor_Subset(const cv::KeyPoint& kpt, unsigned char* desc); //void Get_MLDB_Descriptor_Subset(const cv::KeyPoint& kpt, unsigned char* desc);
// Methods for saving some results and showing computation times // Methods for saving some results and showing computation times
void Save_Scale_Space(); //void Save_Scale_Space();
void Save_Detector_Responses(); //void Save_Detector_Responses();
void Show_Computation_Times() const; //void Show_Computation_Times() const;
/// Return the computation times /// Return the computation times
AKAZETiming Get_Computation_Times() const { //AKAZETiming Get_Computation_Times() const {
return timing_; // return timing_;
} //}
}; };
/* ************************************************************************* */ /* ************************************************************************* */

416
modules/features2d/src/kaze/KAZE.cpp
View File

File diff suppressed because it is too large Load Diff

56
modules/features2d/src/kaze/KAZE.h
View File

@@ -54,13 +54,13 @@ private:
std::vector<int> nsteps_; // Vector of number of steps per cycle std::vector<int> nsteps_; // Vector of number of steps per cycle
// Computation times variables in ms // Computation times variables in ms
double tkcontrast_; // Kcontrast factor computation //double tkcontrast_; // Kcontrast factor computation
double tnlscale_; // Nonlinear Scale space generation //double tnlscale_; // Nonlinear Scale space generation
double tdetector_; // Feature detector //double tdetector_; // Feature detector
double tmderivatives_; // Multiscale derivatives computation //double tmderivatives_; // Multiscale derivatives computation
double tdresponse_; // Detector response computation //double tdresponse_; // Detector response computation
double tdescriptor_; // Feature descriptor //double tdescriptor_; // Feature descriptor
double tsubpixel_; // Subpixel refinement //double tsubpixel_; // Subpixel refinement
// Some auxiliary variables used in the AOS step // Some auxiliary variables used in the AOS step
cv::Mat Ltx_, Lty_, px_, py_, ax_, ay_, bx_, by_, qr_, qc_; cv::Mat Ltx_, Lty_, px_, py_, ax_, ay_, bx_, by_, qr_, qc_;
@@ -243,33 +243,33 @@ public:
return use_extended_; return use_extended_;
} }
float Get_Time_KContrast(void) { //float Get_Time_KContrast(void) {
return tkcontrast_; // return tkcontrast_;
} //}
float Get_Time_NLScale(void) { //float Get_Time_NLScale(void) {
return tnlscale_; // return tnlscale_;
} //}
float Get_Time_Detector(void) { //float Get_Time_Detector(void) {
return tdetector_; // return tdetector_;
} //}
float Get_Time_Multiscale_Derivatives(void) { //float Get_Time_Multiscale_Derivatives(void) {
return tmderivatives_; // return tmderivatives_;
} //}
float Get_Time_Detector_Response(void) { //float Get_Time_Detector_Response(void) {
return tdresponse_; // return tdresponse_;
} //}
float Get_Time_Descriptor(void) { //float Get_Time_Descriptor(void) {
return tdescriptor_; // return tdescriptor_;
} //}
float Get_Time_Subpixel(void) { //float Get_Time_Subpixel(void) {
return tsubpixel_; // return tsubpixel_;
} //}
}; };
//************************************************************************************* //*************************************************************************************

2
modules/features2d/src/kaze/config.h
View File

@@ -63,7 +63,7 @@ struct KAZEOptions {
KAZEOptions() { KAZEOptions() {
// Load the default options // Load the default options
soffset = DEFAULT_SCALE_OFFSET; soffset = DEFAULT_SCALE_OFFSET;
omax = DEFAULT_OCTAVE_MAX; omax = static_cast<int>(DEFAULT_OCTAVE_MAX);
nsublevels = DEFAULT_NSUBLEVELS; nsublevels = DEFAULT_NSUBLEVELS;
dthreshold = DEFAULT_DETECTOR_THRESHOLD; dthreshold = DEFAULT_DETECTOR_THRESHOLD;
use_fed = DEFAULT_USE_FED; use_fed = DEFAULT_USE_FED;