added dummy methods to the filtering classes to avoid compiler warnings

git-svn-id: https://code.ros.org/svn/opencv/trunk@787 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/include/opencv/cv.hpp b/opencv/include/opencv/cv.hpp
index 6dbb0d4fe25768b19c586d7c09e25c2cf464ed4a..c8cccb42f8312b7245fec4928c3d2fdf3eae4b1d 100644 (file)
--- a/opencv/include/opencv/cv.hpp
+++ b/opencv/include/opencv/cv.hpp
@@ -181,6 +181,14 @@ public:
                              int dx, int dy, int aperture_size, int flags=0 );
     virtual void init_gaussian( int _max_width, int _src_type, int _dst_type,
                                 int gaussian_size, double sigma );
+
+    /* dummy method to avoid compiler warnings */
+    virtual void init( int _max_width, int _src_type, int _dst_type,
+                       bool _is_separable, CvSize _ksize,
+                       CvPoint _anchor=cvPoint(-1,-1),
+                       int _border_mode=IPL_BORDER_REPLICATE,
+                       CvScalar _border_value=cvScalarAll(0) );
+
     virtual void clear();
     const CvMat* get_x_kernel() const { return kx; }
     const CvMat* get_y_kernel() const { return ky; }
@@ -217,6 +225,14 @@ public:
                        CvPoint _anchor=cvPoint(-1,-1),
                        int _border_mode=IPL_BORDER_REPLICATE,
                        CvScalar _border_value=cvScalarAll(0) );
+
+    /* dummy method to avoid compiler warnings */
+    virtual void init( int _max_width, int _src_type, int _dst_type,
+                       bool _is_separable, CvSize _ksize,
+                       CvPoint _anchor=cvPoint(-1,-1),
+                       int _border_mode=IPL_BORDER_REPLICATE,
+                       CvScalar _border_value=cvScalarAll(0) );
+
     virtual void clear();
     const CvMat* get_kernel() const { return kernel; }
     uchar* get_kernel_sparse_buf() { return k_sparse; }
@@ -244,6 +260,7 @@ public:
                        CvPoint _anchor=cvPoint(-1,-1),
                        int _border_mode=IPL_BORDER_REPLICATE,
                        CvScalar _border_value=cvScalarAll(0) );
+
     virtual ~CvBoxFilter();
     bool is_normalized() const { return normalized; }
     double get_scale() const { return scale; }
@@ -274,6 +291,20 @@ public:
                        bool _normalized, int _ksize,
                        int _border_mode=IPL_BORDER_REPLICATE,
                        CvScalar _border_value=cvScalarAll(0) );
+
+    /* dummy methods to avoid compiler warnings */
+    virtual void init( int _max_width, int _src_type, int _dst_type,
+                       bool _is_separable, CvSize _ksize,
+                       CvPoint _anchor=cvPoint(-1,-1),
+                       int _border_mode=IPL_BORDER_REPLICATE,
+                       CvScalar _border_value=cvScalarAll(0) );
+
+    virtual void init( int _max_width, int _src_type, int _dst_type,
+                       const CvMat* _kx, const CvMat* _ky,
+                       CvPoint _anchor=cvPoint(-1,-1),
+                       int _border_mode=IPL_BORDER_REPLICATE,
+                       CvScalar _border_value=cvScalarAll(0) );
+
     bool is_normalized() const { return normalized; }
     bool is_basic_laplacian() const { return basic_laplacian; }
 protected:
@@ -300,6 +331,14 @@ public:
                        CvSize _ksize=cvSize(0,0), CvPoint _anchor=cvPoint(-1,-1),
                        int _border_mode=IPL_BORDER_REPLICATE,
                        CvScalar _border_value=cvScalarAll(0) );
+
+    /* dummy method to avoid compiler warnings */
+    virtual void init( int _max_width, int _src_type, int _dst_type,
+                       bool _is_separable, CvSize _ksize,
+                       CvPoint _anchor=cvPoint(-1,-1),
+                       int _border_mode=IPL_BORDER_REPLICATE,
+                       CvScalar _border_value=cvScalarAll(0) );
+
     virtual void clear();
     const CvMat* get_element() const { return element; }
     int get_element_shape() const { return el_shape; }

diff --git a/opencv/src/cv/cvderiv.cpp b/opencv/src/cv/cvderiv.cpp
index 9d5132cde5aede492b8373a21fd94de806930049..658b31a7d9b973d34772d4fb3022ec94cbd83c34 100644 (file)
--- a/opencv/src/cv/cvderiv.cpp
+++ b/opencv/src/cv/cvderiv.cpp
@@ -462,6 +462,26 @@ void CvLaplaceFilter::init( int _max_width, int _src_type, int _dst_type, bool _
 }
 
 
+void CvLaplaceFilter::init( int _max_width, int _src_type, int _dst_type,
+                            bool _is_separable, CvSize _ksize,
+                            CvPoint _anchor, int _border_mode,
+                            CvScalar _border_value )
+{
+    CvSepFilter::init( _max_width, _src_type, _dst_type, _is_separable,
+                       _ksize, _anchor, _border_mode, _border_value );
+}
+
+
+void CvLaplaceFilter::init( int _max_width, int _src_type, int _dst_type,
+                            const CvMat* _kx, const CvMat* _ky,
+                            CvPoint _anchor, int _border_mode,
+                            CvScalar _border_value )
+{
+    CvSepFilter::init( _max_width, _src_type, _dst_type, _kx, _ky,
+                       _anchor, _border_mode, _border_value );
+}
+
+
 #define ICV_LAPLACE_ROW( flavor, srctype, dsttype, load_macro )         \
 static void                                                             \
 icvLaplaceRow_##flavor( const srctype* src, dsttype* dst, void* params )\

diff --git a/opencv/src/cv/cvfilter.cpp b/opencv/src/cv/cvfilter.cpp
index 477b7ecf163b19294c8ba5b0924e794cee107464..cc3fd7c3f94bceb18349e04fc690fae48e72fc0c 100644 (file)
--- a/opencv/src/cv/cvfilter.cpp
+++ b/opencv/src/cv/cvfilter.cpp
@@ -865,6 +865,16 @@ void CvSepFilter::init( int _max_width, int _src_type, int _dst_type,
 }
 
 
+void CvSepFilter::init( int _max_width, int _src_type, int _dst_type,
+                        bool _is_separable, CvSize _ksize,
+                        CvPoint _anchor, int _border_mode,
+                        CvScalar _border_value )
+{
+    CvBaseImageFilter::init( _max_width, _src_type, _dst_type, _is_separable,
+                             _ksize, _anchor, _border_mode, _border_value );
+}
+
+
 static void
 icvFilterRowSymm_8u32s( const uchar* src, int* dst, void* params )
 {
@@ -2161,6 +2171,16 @@ void CvLinearFilter::init( int _max_width, int _src_type, int _dst_type,
 }
 
 
+void CvLinearFilter::init( int _max_width, int _src_type, int _dst_type,
+                           bool _is_separable, CvSize _ksize,
+                           CvPoint _anchor, int _border_mode,
+                           CvScalar _border_value )
+{
+    CvBaseImageFilter::init( _max_width, _src_type, _dst_type, _is_separable,
+                             _ksize, _anchor, _border_mode, _border_value );
+}
+
+
 #define ICV_FILTER( flavor, arrtype, worktype, load_macro,          \
                     cast_macro1, cast_macro2 )                      \
 static void                                                         \

diff --git a/opencv/src/cv/cvmorph.cpp b/opencv/src/cv/cvmorph.cpp
index 514c325ff8ec74c125463d48af126ac1d8893fdd..ebbc8326c53f1812de845d8ac5cba837b150b5b6 100644 (file)
--- a/opencv/src/cv/cvmorph.cpp
+++ b/opencv/src/cv/cvmorph.cpp
@@ -266,6 +266,16 @@ void CvMorphology::init( int _operation, int _max_width, int _src_dst_type,
 }
 
 
+void CvMorphology::init( int _max_width, int _src_type, int _dst_type,
+                         bool _is_separable, CvSize _ksize,
+                         CvPoint _anchor, int _border_mode,
+                         CvScalar _border_value )
+{
+    CvBaseImageFilter::init( _max_width, _src_type, _dst_type, _is_separable,
+                             _ksize, _anchor, _border_mode, _border_value );
+}
+
+
 void CvMorphology::start_process( CvSlice x_range, int width )
 {
     CvBaseImageFilter::start_process( x_range, width );