added pyramid up and pyramid down

scikits/image/opencv/opencv_backend.c

@@ -1,4 +1,4 @@
-/* Generated by Cython 0.11.3 on Sat Oct 24 17:38:28 2009 */
+/* Generated by Cython 0.11.3 on Sat Oct 24 18:40:26 2009 */
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"

scikits/image/opencv/opencv_cv.pyx

@@ -245,6 +245,16 @@ cdef cvAdaptiveThresholdPtr c_cvAdaptiveThreshold
 c_cvAdaptiveThreshold = (<cvAdaptiveThresholdPtr*><size_t>
                          ctypes.addressof(cv.cvAdaptiveThreshold))[0]
 
+# cvPyrDown
+ctypedef void (*cvPyrDownPtr)(IplImage*, IplImage*, int)
+cdef cvPyrDownPtr c_cvPyrDown
+c_cvPyrDown = (<cvPyrDownPtr*><size_t>ctypes.addressof(cv.cvPyrDown))[0]
+
+# cvPyrUp
+ctypedef void (*cvPyrUpPtr)(IplImage*, IplImage*, int)
+cdef cvPyrUpPtr c_cvPyrUp
+c_cvPyrUp = (<cvPyrUpPtr*><size_t>ctypes.addressof(cv.cvPyrUp))[0]
+
 # cvCalibrateCamera2
 ctypedef void (*cvCalibrateCamera2Ptr)(CvMat*, CvMat*, CvMat*,
        CvSize, CvMat*, CvMat*, CvMat*, CvMat*, int)
@@ -1233,6 +1243,52 @@ def cvAdaptiveThreshold(np.ndarray src, double max_value,
 
     return out
 
+def cvPyrDown(np.ndarray src):
+
+    validate_array(src)
+    assert_dtype(src, [UINT8, UINT16, FLOAT32, FLOAT64])
+
+    cdef int outdim = src.ndim
+    cdef np.npy_intp* outshape = clone_array_shape(src)
+    outshape[0] = <np.npy_intp>(src.shape[0] + 1) / 2
+    outshape[1] = <np.npy_intp>(src.shape[1] + 1) / 2
+
+    cdef np.ndarray out = new_array(outdim, outshape, src.dtype)
+
+    cdef IplImage srcimg
+    cdef IplImage outimg
+    populate_iplimage(src, &srcimg)
+    populate_iplimage(out, &outimg)
+
+    c_cvPyrDown(&srcimg, &outimg, 7)
+
+    PyMem_Free(outshape)
+
+    return out
+
+def cvPyrUp(np.ndarray src):
+
+    validate_array(src)
+    assert_dtype(src, [UINT8, UINT16, FLOAT32, FLOAT64])
+
+    cdef int outdim = src.ndim
+    cdef np.npy_intp* outshape = clone_array_shape(src)
+    outshape[0] = <np.npy_intp>(src.shape[0] * 2)
+    outshape[1] = <np.npy_intp>(src.shape[1] * 2)
+
+    cdef np.ndarray out = new_array(outdim, outshape, src.dtype)
+
+    cdef IplImage srcimg
+    cdef IplImage outimg
+    populate_iplimage(src, &srcimg)
+    populate_iplimage(out, &outimg)
+
+    c_cvPyrUp(&srcimg, &outimg, 7)
+
+    PyMem_Free(outshape)
+
+    return out
+
 def cvCalibrateCamera2(np.ndarray object_points, np.ndarray image_points,
            np.ndarray point_counts, image_size):
 

scikits/image/opencv/tests/test_opencv_cv.py

@@ -217,6 +217,18 @@ class TestAdaptiveThreshold(OpenCVTest):
         cvAdaptiveThreshold(self.lena_GRAY_U8, 100)
 
 
+class TestPyrDown(OpenCVTest):
+    @opencv_skip
+    def test_cvPyrDown(self):
+        cvPyrDown(self.lena_RGB_U8)
+
+
+class TestPyrUp(OpenCVTest):
+    @opencv_skip
+    def test_cvPyrUp(self):
+        cvPyrUp(self.lena_RGB_U8)
+
+
 class TestFindChessboardCorners(object):
     @opencv_skip
     def test_cvFindChessboardCorners(self):