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

modules/features2d/src/akaze.cpp

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

modules/features2d/src/akaze/AKAZE.h

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

modules/features2d/src/kaze/KAZE.h

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

modules/features2d/src/kaze/config.h

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