From: Ievgen Khvedchenia Date: Tue, 29 Apr 2014 18:39:27 +0000 (+0300) Subject: Clean-up of getters/setters that are not needed by OpenCV X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~400^2~17 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4509fe55c2d730ca068d1d05046bf4086b64c09c;p=profile%2Fivi%2Fopencv.git Clean-up of getters/setters that are not needed by OpenCV --- diff --git a/modules/features2d/src/kaze/KAZEFeatures.h b/modules/features2d/src/kaze/KAZEFeatures.h index 8b4c326..21bfe6d 100644 --- a/modules/features2d/src/kaze/KAZEFeatures.h +++ b/modules/features2d/src/kaze/KAZEFeatures.h @@ -33,7 +33,6 @@ private: int nsublevels_; // Number of sublevels per octave level int img_width_; // Width of the original image int img_height_; // Height of the original image - bool save_scale_space_; // For saving scale space images std::vector evolution_; // Vector of nonlinear diffusion evolution float kcontrast_; // The contrast parameter for the scalar nonlinear diffusion float dthreshold_; // Feature detector threshold response @@ -119,146 +118,6 @@ private: // Descriptor Mode -> 2 G-SURF 128 void Get_GSURF_Upright_Descriptor_128(const cv::KeyPoint& kpt, float* desc); void Get_GSURF_Descriptor_128(const cv::KeyPoint& kpt, float* desc); - -public: - - // Setters - void Set_Scale_Offset(float soffset) { - soffset_ = soffset; - } - - void Set_SDerivatives(float sderivatives) { - sderivatives_ = sderivatives; - } - - void Set_Octave_Max(int omax) { - omax_ = omax; - } - - void Set_NSublevels(int nsublevels) { - nsublevels_ = nsublevels; - } - - void Set_Save_Scale_Space_Flag(bool save_scale_space) { - save_scale_space_ = save_scale_space; - } - - void Set_Image_Width(int img_width) { - img_width_ = img_width; - } - - void Set_Image_Height(int img_height) { - img_height_ = img_height; - } - - void Set_KContrast(float kcontrast) { - kcontrast_ = kcontrast; - } - - void Set_Detector_Threshold(float dthreshold) { - dthreshold_ = dthreshold; - } - - void Set_Diffusivity_Type(int diffusivity) { - diffusivity_ = diffusivity; - } - - void Set_Descriptor_Mode(int descriptor_mode) { - descriptor_mode_ = descriptor_mode; - } - - void Set_Use_FED(bool use_fed) { - use_fed_ = use_fed; - } - - void Set_Upright(bool use_upright) { - use_upright_ = use_upright; - } - - void Set_Extended(bool use_extended) { - use_extended_ = use_extended; - } - - // Getters - float Get_Scale_Offset(void) { - return soffset_; - } - - float Get_SDerivatives(void) { - return sderivatives_; - } - - int Get_Octave_Max(void) { - return omax_; - } - - int Get_NSublevels(void) { - return nsublevels_; - } - - bool Get_Save_Scale_Space_Flag(void) { - return save_scale_space_; - } - - int Get_Image_Width(void) { - return img_width_; - } - - int Get_Image_Height(void) { - return img_height_; - } - - float Get_KContrast(void) { - return kcontrast_; - } - - float Get_Detector_Threshold(void) { - return dthreshold_; - } - - int Get_Diffusivity_Type(void) { - return diffusivity_; - } - - int Get_Descriptor_Mode(void) { - return descriptor_mode_; - } - - bool Get_Upright(void) { - return use_upright_; - } - - bool Get_Extended(void) { - return use_extended_; - } - - //float Get_Time_KContrast(void) { - // return tkcontrast_; - //} - - //float Get_Time_NLScale(void) { - // return tnlscale_; - //} - - //float Get_Time_Detector(void) { - // return tdetector_; - //} - - //float Get_Time_Multiscale_Derivatives(void) { - // return tmderivatives_; - //} - - //float Get_Time_Detector_Response(void) { - // return tdresponse_; - //} - - //float Get_Time_Descriptor(void) { - // return tdescriptor_; - //} - - //float Get_Time_Subpixel(void) { - // return tsubpixel_; - //} }; //*************************************************************************************