diff --git a/scikits/image/opencv/opencv_backend.c b/scikits/image/opencv/opencv_backend.c
index 2260956d..84b2b25f 100644
--- a/scikits/image/opencv/opencv_backend.c
+++ b/scikits/image/opencv/opencv_backend.c
@@ -1,4 +1,8 @@
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* Generated by Cython 0.11.3 on Sat Oct 24 13:08:28 2009 */
+=======
+/* Generated by Cython 0.11.3 on Sat Oct 24 15:02:05 2009 */
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -942,6 +946,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *, char *, ch
 static int __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_SIGN;
 static int __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8U;
 static int __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8S;
+static int __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_16U;
 static int __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_16S;
 static int __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32S;
 static int __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32F;
@@ -1001,6 +1006,7 @@ static char __pyx_k_34[] = "int8";
 static PyObject *__pyx_kp_34;
 static char __pyx_k_35[] = "INT8";
 static PyObject *__pyx_kp_35;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 static char __pyx_k_36[] = "int16";
 static PyObject *__pyx_kp_36;
 static char __pyx_k_37[] = "INT16";
@@ -1017,16 +1023,45 @@ static char __pyx_k_42[] = "float64";
 static PyObject *__pyx_kp_42;
 static char __pyx_k_43[] = "FLOAT64";
 static PyObject *__pyx_kp_43;
+=======
+static char __pyx_k_36[] = "uint16";
+static PyObject *__pyx_kp_36;
+static char __pyx_k_37[] = "UINT16";
+static PyObject *__pyx_kp_37;
+static char __pyx_k_38[] = "int16";
+static PyObject *__pyx_kp_38;
+static char __pyx_k_39[] = "INT16";
+static PyObject *__pyx_kp_39;
+static char __pyx_k_40[] = "int32";
+static PyObject *__pyx_kp_40;
+static char __pyx_k_41[] = "INT32";
+static PyObject *__pyx_kp_41;
+static char __pyx_k_42[] = "float32";
+static PyObject *__pyx_kp_42;
+static char __pyx_k_43[] = "FLOAT32";
+static PyObject *__pyx_kp_43;
+static char __pyx_k_44[] = "float64";
+static PyObject *__pyx_kp_44;
+static char __pyx_k_45[] = "FLOAT64";
+static PyObject *__pyx_kp_45;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
 static char __pyx_k__ipltypes[] = "_ipltypes";
 static PyObject *__pyx_kp__ipltypes;
 static char __pyx_k_addressof[] = "addressof";
 static PyObject *__pyx_kp_addressof;
 static char __pyx_k_cvGetMat[] = "cvGetMat";
 static PyObject *__pyx_kp_cvGetMat;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 static char __pyx_k_44[] = "cvCreateStructuringElementEx";
 static PyObject *__pyx_kp_44;
 static char __pyx_k_45[] = "cvReleaseStructuringElement";
 static PyObject *__pyx_kp_45;
+=======
+static char __pyx_k_46[] = "cvCreateStructuringElementEx";
+static PyObject *__pyx_kp_46;
+static char __pyx_k_47[] = "cvReleaseStructuringElement";
+static PyObject *__pyx_kp_47;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
 static char __pyx_k_dtype[] = "dtype";
 static PyObject *__pyx_kp_dtype;
 static char __pyx_k_nbytes[] = "nbytes";
@@ -1043,8 +1078,11 @@ static char __pyx_k_CV_SHAPE_CUSTOM[] = "CV_SHAPE_CUSTOM";
 static PyObject *__pyx_kp_CV_SHAPE_CUSTOM;
 static PyObject *__pyx_builtin_ValueError;
 static PyObject *__pyx_builtin_range;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 static PyObject *__pyx_kp_46;
 static PyObject *__pyx_kp_47;
+=======
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
 static PyObject *__pyx_kp_48;
 static PyObject *__pyx_kp_49;
 static char __pyx_k_46[] = "Array must be contiguous";
@@ -1052,6 +1090,7 @@ static char __pyx_k_47[] = "Arrays must have either 2 or 3 dimensions";
 static char __pyx_k_48[] = "A 3D array must have 4 or less channels";
 static char __pyx_k_49[] = "Arrays must have one of the following dtypes: uint8, int8, int16, int32, float32, float64";
 static PyObject *__pyx_kp_50;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 static char __pyx_k_50[] = "Unsupported dtype for this operation.                           Supported dtypes are %s";
 static PyObject *__pyx_kp_51;
 static char __pyx_k_51[] = "Incorrect number of dimensions";
@@ -1069,6 +1108,31 @@ static PyObject *__pyx_kp_57;
 static PyObject *__pyx_kp_58;
 static char __pyx_k_57[] = "anchor must be (x, y) tuple";
 static char __pyx_k_58[] = "anchor point must be inside kernel";
+=======
+static PyObject *__pyx_kp_51;
+static char __pyx_k_48[] = "Array must be contiguous";
+static char __pyx_k_49[] = "Arrays must have either 2 or 3 dimensions";
+static char __pyx_k_50[] = "A 3D array must have 4 or less channels";
+static char __pyx_k_51[] = "Arrays must have one of the following dtypes: uint8, int8, int16, int32, float32, float64";
+static PyObject *__pyx_kp_52;
+static char __pyx_k_52[] = "Unsupported dtype for this operation.                           Supported dtypes are %s";
+static PyObject *__pyx_kp_53;
+static char __pyx_k_53[] = "Incorrect number of dimensions";
+static PyObject *__pyx_kp_54;
+static char __pyx_k_54[] = "Incorrect number of channels";
+static PyObject *__pyx_kp_55;
+static char __pyx_k_55[] = "dtypes not same";
+static PyObject *__pyx_kp_56;
+static char __pyx_k_56[] = "arrays not same shape";
+static PyObject *__pyx_kp_57;
+static char __pyx_k_57[] = "Arrays must have same width and height";
+static PyObject *__pyx_kp_58;
+static char __pyx_k_58[] = "In place operation not supported. Make sure                           the out array is not just a view of src array";
+static PyObject *__pyx_kp_59;
+static PyObject *__pyx_kp_60;
+static char __pyx_k_59[] = "anchor must be (x, y) tuple";
+static char __pyx_k_60[] = "anchor point must be inside kernel";
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
 static PyObject *__pyx_int_15;
 static char __pyx_k___getbuffer__[] = "__getbuffer__";
 static PyObject *__pyx_kp___getbuffer__;
@@ -1120,7 +1184,11 @@ static char __pyx_k_28[] = "Non-native byte order not supported";
 static char __pyx_k_29[] = "Format string allocated too short.";
 static char __pyx_k_30[] = "unknown dtype code in numpy.pxd (%d)";
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":55
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":57
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * c_cvGetMat = (<cvGetMatPtr*><size_t>ctypes.addressof(cxcore.cvGetMat))[0]
  * 
  * cdef void populate_iplimage(np.ndarray arr, IplImage* img):             # <<<<<<<<<<<<<<
@@ -1139,7 +1207,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
   int __pyx_t_3;
   __Pyx_SetupRefcountContext("populate_iplimage");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":62
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":64
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  *     # everything that will never change
  *     img.nSize = IPLIMAGE_SIZE             # <<<<<<<<<<<<<<
@@ -1148,7 +1220,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_img->nSize = __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPLIMAGE_SIZE;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":63
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":65
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     # everything that will never change
  *     img.nSize = IPLIMAGE_SIZE
  *     img.ID = 0             # <<<<<<<<<<<<<<
@@ -1157,7 +1233,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_img->ID = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":64
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":66
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     img.nSize = IPLIMAGE_SIZE
  *     img.ID = 0
  *     img.dataOrder = 0             # <<<<<<<<<<<<<<
@@ -1166,7 +1246,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_img->dataOrder = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":65
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":67
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     img.ID = 0
  *     img.dataOrder = 0
  *     img.origin = 0             # <<<<<<<<<<<<<<
@@ -1175,7 +1259,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_img->origin = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":66
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":68
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     img.dataOrder = 0
  *     img.origin = 0
  *     img.roi = NULL             # <<<<<<<<<<<<<<
@@ -1184,7 +1272,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_img->roi = NULL;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":67
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":69
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     img.origin = 0
  *     img.roi = NULL
  *     img.maskROI = NULL             # <<<<<<<<<<<<<<
@@ -1193,7 +1285,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_img->maskROI = NULL;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":68
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":70
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     img.roi = NULL
  *     img.maskROI = NULL
  *     img.imageId = NULL             # <<<<<<<<<<<<<<
@@ -1202,7 +1298,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_img->imageId = NULL;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":69
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":71
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     img.maskROI = NULL
  *     img.imageId = NULL
  *     img.tileInfo = NULL             # <<<<<<<<<<<<<<
@@ -1211,7 +1311,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_img->tileInfo = NULL;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":71
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":73
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     img.tileInfo = NULL
  * 
  *     cdef int ndim = arr.ndim             # <<<<<<<<<<<<<<
@@ -1220,7 +1324,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_ndim = __pyx_v_arr->nd;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":72
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":74
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  *     cdef int ndim = arr.ndim
  *     cdef np.npy_intp* shape = arr.shape             # <<<<<<<<<<<<<<
@@ -1229,7 +1337,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_shape = __pyx_v_arr->dimensions;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":73
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":75
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef int ndim = arr.ndim
  *     cdef np.npy_intp* shape = arr.shape
  *     cdef np.npy_intp* strides = arr.strides             # <<<<<<<<<<<<<<
@@ -1238,7 +1350,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_strides = __pyx_v_arr->strides;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":77
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":79
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     # nChannels is essentially the value of np.shape[2] of a 3D numpy array
  *     # for a 2D array, nChannels is 1
  *     if ndim == 1:             # <<<<<<<<<<<<<<
@@ -1248,7 +1364,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
   __pyx_t_1 = (__pyx_v_ndim == 1);
   if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":79
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":81
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     if ndim == 1:
  *         # Might happen for a 1D vector
  *         img.nChannels = 1             # <<<<<<<<<<<<<<
@@ -1257,7 +1377,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
     __pyx_v_img->nChannels = 1;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":80
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":82
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         # Might happen for a 1D vector
  *         img.nChannels = 1
  *         img.width = 1             # <<<<<<<<<<<<<<
@@ -1269,7 +1393,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":82
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":84
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         img.width = 1
  *     else:
  *         if ndim == 2:             # <<<<<<<<<<<<<<
@@ -1279,7 +1407,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
     __pyx_t_1 = (__pyx_v_ndim == 2);
     if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":83
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":85
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     else:
  *         if ndim == 2:
  *             img.nChannels = 1             # <<<<<<<<<<<<<<
@@ -1291,7 +1423,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
     }
     /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":85
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":87
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *             img.nChannels = 1
  *         else:
  *             img.nChannels = shape[2]             # <<<<<<<<<<<<<<
@@ -1302,7 +1438,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
     }
     __pyx_L4:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":86
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":88
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         else:
  *             img.nChannels = shape[2]
  *         img.width = shape[1]             # <<<<<<<<<<<<<<
@@ -1313,7 +1453,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
   }
   __pyx_L3:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":88
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":90
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         img.width = shape[1]
  * 
  *     img.height = shape[0]             # <<<<<<<<<<<<<<
@@ -1322,7 +1466,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_img->height = (__pyx_v_shape[0]);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":89
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":91
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  *     img.height = shape[0]
  *     img.widthStep = strides[0]             # <<<<<<<<<<<<<<
@@ -1331,13 +1479,18 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_img->widthStep = (__pyx_v_strides[0]);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":90
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":92
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     img.height = shape[0]
  *     img.widthStep = strides[0]
  *     img.depth = _ipltypes[arr.dtype]             # <<<<<<<<<<<<<<
  *     img.imageSize = arr.nbytes
  *     img.imageData = <char*>arr.data
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp__ipltypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1351,12 +1504,28 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
   __pyx_v_img->depth = __pyx_t_3;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":91
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp__ipltypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_2 = PyObject_GetItem(__pyx_1, __pyx_t_2); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_t_3 = __Pyx_PyInt_AsInt(__pyx_2); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_v_img->depth = __pyx_t_3;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":93
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     img.widthStep = strides[0]
  *     img.depth = _ipltypes[arr.dtype]
  *     img.imageSize = arr.nbytes             # <<<<<<<<<<<<<<
  *     img.imageData = <char*>arr.data
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_nbytes); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_3 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1364,6 +1533,15 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
   __pyx_v_img->imageSize = __pyx_t_3;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":92
+=======
+  __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_nbytes); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_3 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_v_img->imageSize = __pyx_t_3;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":94
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     img.depth = _ipltypes[arr.dtype]
  *     img.imageSize = arr.nbytes
  *     img.imageData = <char*>arr.data             # <<<<<<<<<<<<<<
@@ -1372,7 +1550,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
  */
   __pyx_v_img->imageData = ((char *)__pyx_v_arr->data);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":97
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":99
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     # deallocate images, but it will never attempt to deallocate images we
  *     # create ourselves.
  *     img.imageDataOrigin = <char*>NULL             # <<<<<<<<<<<<<<
@@ -1391,7 +1573,11 @@ static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(
   __Pyx_FinishRefcountContext();
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":99
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":101
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     img.imageDataOrigin = <char*>NULL
  * 
  * cdef CvMat* cvmat_ptr_from_iplimage(IplImage* arr):             # <<<<<<<<<<<<<<
@@ -1404,7 +1590,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_f_7sci
   struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_r;
   __Pyx_SetupRefcountContext("cvmat_ptr_from_iplimage");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":106
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":108
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     # This means that you have to call PyMem_Free on the CvMat* when you're
  *     # done with it.
  *     cdef CvMat* mat_hdr = <CvMat*>PyMem_Malloc(sizeof(CvMat))             # <<<<<<<<<<<<<<
@@ -1413,7 +1603,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_f_7sci
  */
   __pyx_v_mat_hdr = ((struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *)PyMem_Malloc((sizeof(struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat))));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":107
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":109
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     # done with it.
  *     cdef CvMat* mat_hdr = <CvMat*>PyMem_Malloc(sizeof(CvMat))
  *     mat_hdr = c_cvGetMat(arr, mat_hdr, NULL, 0)             # <<<<<<<<<<<<<<
@@ -1422,7 +1616,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_f_7sci
  */
   __pyx_v_mat_hdr = __pyx_v_7scikits_5image_6opencv_14opencv_backend_c_cvGetMat(__pyx_v_arr, __pyx_v_mat_hdr, NULL, 0);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":108
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":110
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef CvMat* mat_hdr = <CvMat*>PyMem_Malloc(sizeof(CvMat))
  *     mat_hdr = c_cvGetMat(arr, mat_hdr, NULL, 0)
  *     return mat_hdr             # <<<<<<<<<<<<<<
@@ -1438,7 +1636,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_f_7sci
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":110
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":112
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return mat_hdr
  * 
  * cdef int validate_array(np.ndarray arr) except -1:             # <<<<<<<<<<<<<<
@@ -1454,7 +1656,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr
   PyObject *__pyx_t_3 = NULL;
   __Pyx_SetupRefcountContext("validate_array");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":111
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":113
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  * cdef int validate_array(np.ndarray arr) except -1:
  *     assert PyArray_ISCONTIGUOUS(arr), 'Array must be contiguous'             # <<<<<<<<<<<<<<
@@ -1463,12 +1669,21 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr
  */
   #ifndef PYREX_WITHOUT_ASSERTIONS
   if (unlikely(!PyArray_ISCONTIGUOUS(__pyx_v_arr))) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     PyErr_SetObject(PyExc_AssertionError, __pyx_kp_46);
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   #endif
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":112
+=======
+    PyErr_SetObject(PyExc_AssertionError, __pyx_kp_48);
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  }
+  #endif
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":114
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int validate_array(np.ndarray arr) except -1:
  *     assert PyArray_ISCONTIGUOUS(arr), 'Array must be contiguous'
  *     if arr.ndim != 2 and arr.ndim != 3:             # <<<<<<<<<<<<<<
@@ -1482,29 +1697,50 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr
   }
   if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":113
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":115
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     assert PyArray_ISCONTIGUOUS(arr), 'Array must be contiguous'
  *     if arr.ndim != 2 and arr.ndim != 3:
  *         raise ValueError('Arrays must have either 2 or 3 dimensions')             # <<<<<<<<<<<<<<
  *     if arr.ndim == 3:
  *         if arr.shape[2] > 4:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_47);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_47);
     __Pyx_GIVEREF(__pyx_kp_47);
     __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_49);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_49);
+    __Pyx_GIVEREF(__pyx_kp_49);
+    __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_3, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     goto __pyx_L3;
   }
   __pyx_L3:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":114
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":116
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     if arr.ndim != 2 and arr.ndim != 3:
  *         raise ValueError('Arrays must have either 2 or 3 dimensions')
  *     if arr.ndim == 3:             # <<<<<<<<<<<<<<
@@ -1514,7 +1750,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr
   __pyx_t_1 = (__pyx_v_arr->nd == 3);
   if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":115
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":117
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         raise ValueError('Arrays must have either 2 or 3 dimensions')
  *     if arr.ndim == 3:
  *         if arr.shape[2] > 4:             # <<<<<<<<<<<<<<
@@ -1524,24 +1764,41 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr
     __pyx_t_1 = ((__pyx_v_arr->dimensions[2]) > 4);
     if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":116
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":118
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     if arr.ndim == 3:
  *         if arr.shape[2] > 4:
  *             raise ValueError('A 3D array must have 4 or less channels')             # <<<<<<<<<<<<<<
  *     if arr.dtype not in _ipltypes:
  *         raise ValueError('Arrays must have one of the following dtypes: '
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
       __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(((PyObject *)__pyx_t_3));
       __Pyx_INCREF(__pyx_kp_48);
       PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_48);
       __Pyx_GIVEREF(__pyx_kp_48);
       __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+      __Pyx_INCREF(__pyx_kp_50);
+      PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_50);
+      __Pyx_GIVEREF(__pyx_kp_50);
+      __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
       __Pyx_GOTREF(__pyx_t_2);
       __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
       __Pyx_Raise(__pyx_t_2, 0, 0);
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
       {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
       goto __pyx_L5;
     }
     __pyx_L5:;
@@ -1549,45 +1806,78 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr
   }
   __pyx_L4:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":117
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":119
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         if arr.shape[2] > 4:
  *             raise ValueError('A 3D array must have 4 or less channels')
  *     if arr.dtype not in _ipltypes:             # <<<<<<<<<<<<<<
  *         raise ValueError('Arrays must have one of the following dtypes: '
  *                          'uint8, int8, int16, int32, float32, float64')
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp__ipltypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = (!PySequence_Contains(__pyx_1, __pyx_t_2)); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp__ipltypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = (!PySequence_Contains(__pyx_1, __pyx_t_2)); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 119; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
   if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":118
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":120
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *             raise ValueError('A 3D array must have 4 or less channels')
  *     if arr.dtype not in _ipltypes:
  *         raise ValueError('Arrays must have one of the following dtypes: '             # <<<<<<<<<<<<<<
  *                          'uint8, int8, int16, int32, float32, float64')
  *     return 1
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_49);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_49);
     __Pyx_GIVEREF(__pyx_kp_49);
     __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_51);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_51);
+    __Pyx_GIVEREF(__pyx_kp_51);
+    __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_3, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     goto __pyx_L6;
   }
   __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":120
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":122
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         raise ValueError('Arrays must have one of the following dtypes: '
  *                          'uint8, int8, int16, int32, float32, float64')
  *     return 1             # <<<<<<<<<<<<<<
@@ -1610,7 +1900,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(PyAr
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":122
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":124
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return 1
  * 
  * cdef int assert_dtype(np.ndarray arr, dtypes) except -1:             # <<<<<<<<<<<<<<
@@ -1625,13 +1919,18 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(PyArra
   PyObject *__pyx_t_3 = NULL;
   __Pyx_SetupRefcountContext("assert_dtype");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":123
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":125
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  * cdef int assert_dtype(np.ndarray arr, dtypes) except -1:
  *     if arr.dtype not in dtypes:             # <<<<<<<<<<<<<<
  *         raise ValueError('Unsupported dtype for this operation. \
  *                           Supported dtypes are %s' % str(dtypes))
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 123; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = (!PySequence_Contains(__pyx_v_dtypes, __pyx_t_1)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 123; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1639,17 +1938,31 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(PyArra
   if (__pyx_t_2) {
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":125
+=======
+  __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_t_2 = (!PySequence_Contains(__pyx_v_dtypes, __pyx_t_1)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  if (__pyx_t_2) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":127
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     if arr.dtype not in dtypes:
  *         raise ValueError('Unsupported dtype for this operation. \
  *                           Supported dtypes are %s' % str(dtypes))             # <<<<<<<<<<<<<<
  *     return 1
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     __Pyx_GOTREF(((PyObject *)__pyx_t_1));
     __Pyx_INCREF(__pyx_v_dtypes);
     PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_dtypes);
     __Pyx_GIVEREF(__pyx_v_dtypes);
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)&PyString_Type)), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
@@ -1657,21 +1970,42 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(PyArra
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
     __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_3 = PyObject_Call(((PyObject *)((PyObject*)&PyString_Type)), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
+    __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+    __pyx_t_1 = PyNumber_Remainder(__pyx_kp_52, __pyx_t_3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 127; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_1);
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     __Pyx_GOTREF(((PyObject *)__pyx_t_3));
     PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1);
     __Pyx_GIVEREF(__pyx_t_1);
     __pyx_t_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_1 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_1 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     __Pyx_GOTREF(__pyx_t_1);
     __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
     __Pyx_Raise(__pyx_t_1, 0, 0);
     __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     goto __pyx_L3;
   }
   __pyx_L3:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":126
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":128
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         raise ValueError('Unsupported dtype for this operation. \
  *                           Supported dtypes are %s' % str(dtypes))
  *     return 1             # <<<<<<<<<<<<<<
@@ -1693,7 +2027,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(PyArra
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":128
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":130
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return 1
  * 
  * cdef int assert_ndims(np.ndarray arr, dims) except -1:             # <<<<<<<<<<<<<<
@@ -1708,13 +2046,18 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(PyArra
   PyObject *__pyx_t_3 = NULL;
   __Pyx_SetupRefcountContext("assert_ndims");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":129
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":131
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  * cdef int assert_ndims(np.ndarray arr, dims) except -1:
  *     if arr.ndim not in dims:             # <<<<<<<<<<<<<<
  *         raise ValueError('Incorrect number of dimensions')
  *     return 1
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = PyInt_FromLong(__pyx_v_arr->nd); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = (!PySequence_Contains(__pyx_v_dims, __pyx_t_1)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 129; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1722,28 +2065,54 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(PyArra
   if (__pyx_t_2) {
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":130
+=======
+  __pyx_t_1 = PyInt_FromLong(__pyx_v_arr->nd); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_t_2 = (!PySequence_Contains(__pyx_v_dims, __pyx_t_1)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 131; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  if (__pyx_t_2) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":132
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int assert_ndims(np.ndarray arr, dims) except -1:
  *     if arr.ndim not in dims:
  *         raise ValueError('Incorrect number of dimensions')             # <<<<<<<<<<<<<<
  *     return 1
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_1));
     __Pyx_INCREF(__pyx_kp_51);
     PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_kp_51);
     __Pyx_GIVEREF(__pyx_kp_51);
     __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+    __Pyx_INCREF(__pyx_kp_53);
+    PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_kp_53);
+    __Pyx_GIVEREF(__pyx_kp_53);
+    __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
     __Pyx_Raise(__pyx_t_3, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 130; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     goto __pyx_L3;
   }
   __pyx_L3:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":131
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":133
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     if arr.ndim not in dims:
  *         raise ValueError('Incorrect number of dimensions')
  *     return 1             # <<<<<<<<<<<<<<
@@ -1765,7 +2134,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(PyArra
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":133
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":135
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return 1
  * 
  * cdef int assert_nchannels(np.ndarray arr, channels) except -1:             # <<<<<<<<<<<<<<
@@ -1781,7 +2154,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py
   PyObject *__pyx_t_3 = NULL;
   __Pyx_SetupRefcountContext("assert_nchannels");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":135
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":137
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int assert_nchannels(np.ndarray arr, channels) except -1:
  *     cdef int nchannels
  *     if arr.ndim == 2:             # <<<<<<<<<<<<<<
@@ -1791,7 +2168,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py
   __pyx_t_1 = (__pyx_v_arr->nd == 2);
   if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":136
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":138
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef int nchannels
  *     if arr.ndim == 2:
  *         nchannels = 1             # <<<<<<<<<<<<<<
@@ -1803,7 +2184,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":138
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":140
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         nchannels = 1
  *     else:
  *         nchannels = arr.shape[2]             # <<<<<<<<<<<<<<
@@ -1814,13 +2199,18 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py
   }
   __pyx_L3:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":139
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":141
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     else:
  *         nchannels = arr.shape[2]
  *     if nchannels not in channels:             # <<<<<<<<<<<<<<
  *         raise ValueError('Incorrect number of channels')
  *     return 1
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_2 = PyInt_FromLong(__pyx_v_nchannels); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_t_1 = (!PySequence_Contains(__pyx_v_channels, __pyx_t_2)); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1828,28 +2218,54 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py
   if (__pyx_t_1) {
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":140
+=======
+  __pyx_t_2 = PyInt_FromLong(__pyx_v_nchannels); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_1 = (!PySequence_Contains(__pyx_v_channels, __pyx_t_2)); if (unlikely(__pyx_t_1 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 141; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  if (__pyx_t_1) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":142
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         nchannels = arr.shape[2]
  *     if nchannels not in channels:
  *         raise ValueError('Incorrect number of channels')             # <<<<<<<<<<<<<<
  *     return 1
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_52);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_52);
     __Pyx_GIVEREF(__pyx_kp_52);
     __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_54);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_54);
+    __Pyx_GIVEREF(__pyx_kp_54);
+    __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_3, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 142; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     goto __pyx_L4;
   }
   __pyx_L4:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":141
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":143
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     if nchannels not in channels:
  *         raise ValueError('Incorrect number of channels')
  *     return 1             # <<<<<<<<<<<<<<
@@ -1871,7 +2287,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(Py
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":143
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":145
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return 1
  * 
  * cdef int assert_same_dtype(np.ndarray arr1, np.ndarray arr2) except -1:             # <<<<<<<<<<<<<<
@@ -1887,13 +2307,18 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype(P
   int __pyx_t_4;
   __Pyx_SetupRefcountContext("assert_same_dtype");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":144
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":146
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  * cdef int assert_same_dtype(np.ndarray arr1, np.ndarray arr2) except -1:
  *     if arr1.dtype != arr2.dtype:             # <<<<<<<<<<<<<<
  *         raise ValueError('dtypes not same')
  *     return 1
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arr1), __pyx_kp_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_arr2), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1907,28 +2332,60 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype(P
   if (__pyx_t_4) {
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":145
+=======
+  __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arr1), __pyx_kp_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_arr2), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_3 = PyObject_RichCompare(__pyx_t_1, __pyx_t_2, Py_NE); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  if (__pyx_t_4) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":147
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int assert_same_dtype(np.ndarray arr1, np.ndarray arr2) except -1:
  *     if arr1.dtype != arr2.dtype:
  *         raise ValueError('dtypes not same')             # <<<<<<<<<<<<<<
  *     return 1
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_3));
     __Pyx_INCREF(__pyx_kp_53);
     PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_53);
     __Pyx_GIVEREF(__pyx_kp_53);
     __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+    __Pyx_INCREF(__pyx_kp_55);
+    PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_55);
+    __Pyx_GIVEREF(__pyx_kp_55);
+    __pyx_t_2 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
     __Pyx_Raise(__pyx_t_2, 0, 0);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 145; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 147; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     goto __pyx_L3;
   }
   __pyx_L3:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":146
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":148
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     if arr1.dtype != arr2.dtype:
  *         raise ValueError('dtypes not same')
  *     return 1             # <<<<<<<<<<<<<<
@@ -1951,7 +2408,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype(P
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":148
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":150
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return 1
  * 
  * cdef int assert_same_shape(np.ndarray arr1, np.ndarray arr2) except -1:             # <<<<<<<<<<<<<<
@@ -1966,7 +2427,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(P
   PyObject *__pyx_t_3 = NULL;
   __Pyx_SetupRefcountContext("assert_same_shape");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":149
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":151
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  * cdef int assert_same_shape(np.ndarray arr1, np.ndarray arr2) except -1:
  *     if not np.PyArray_SAMESHAPE(arr1, arr2):             # <<<<<<<<<<<<<<
@@ -1976,29 +2441,50 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(P
   __pyx_t_1 = (!PyArray_SAMESHAPE(__pyx_v_arr1, __pyx_v_arr2));
   if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":150
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":152
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int assert_same_shape(np.ndarray arr1, np.ndarray arr2) except -1:
  *     if not np.PyArray_SAMESHAPE(arr1, arr2):
  *         raise ValueError('arrays not same shape')             # <<<<<<<<<<<<<<
  *     return 1
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_54);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_54);
     __Pyx_GIVEREF(__pyx_kp_54);
     __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_56);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_56);
+    __Pyx_GIVEREF(__pyx_kp_56);
+    __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_3, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 150; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     goto __pyx_L3;
   }
   __pyx_L3:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":151
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":153
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     if not np.PyArray_SAMESHAPE(arr1, arr2):
  *         raise ValueError('arrays not same shape')
  *     return 1             # <<<<<<<<<<<<<<
@@ -2020,7 +2506,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(P
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":153
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":155
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return 1
  * 
  * cdef int assert_same_width_and_height(np.ndarray arr1, np.ndarray arr2) \             # <<<<<<<<<<<<<<
@@ -2037,7 +2527,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_a
   PyObject *__pyx_t_3 = NULL;
   __Pyx_SetupRefcountContext("assert_same_width_and_height");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":155
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":157
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int assert_same_width_and_height(np.ndarray arr1, np.ndarray arr2) \
  *      except -1:
  *     cdef np.npy_intp* shape1 = arr1.shape             # <<<<<<<<<<<<<<
@@ -2046,7 +2540,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_a
  */
   __pyx_v_shape1 = __pyx_v_arr1->dimensions;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":156
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":158
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *      except -1:
  *     cdef np.npy_intp* shape1 = arr1.shape
  *     cdef np.npy_intp* shape2 = arr2.shape             # <<<<<<<<<<<<<<
@@ -2055,7 +2553,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_a
  */
   __pyx_v_shape2 = __pyx_v_arr2->dimensions;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":157
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":159
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef np.npy_intp* shape1 = arr1.shape
  *     cdef np.npy_intp* shape2 = arr2.shape
  *     if (shape1[0] != shape2[0]) or (shape1[1] != shape2[1]):             # <<<<<<<<<<<<<<
@@ -2069,29 +2571,50 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_a
   }
   if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":158
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":160
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef np.npy_intp* shape2 = arr2.shape
  *     if (shape1[0] != shape2[0]) or (shape1[1] != shape2[1]):
  *         raise ValueError('Arrays must have same width and height')             # <<<<<<<<<<<<<<
  *     return 1
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_55);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_55);
     __Pyx_GIVEREF(__pyx_kp_55);
     __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_57);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_57);
+    __Pyx_GIVEREF(__pyx_kp_57);
+    __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_3, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 160; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     goto __pyx_L3;
   }
   __pyx_L3:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":159
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":161
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     if (shape1[0] != shape2[0]) or (shape1[1] != shape2[1]):
  *         raise ValueError('Arrays must have same width and height')
  *     return 1             # <<<<<<<<<<<<<<
@@ -2113,7 +2636,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_a
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":161
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":163
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return 1
  * 
  * cdef int assert_like(np.ndarray arr1, np.ndarray arr2) except -1:             # <<<<<<<<<<<<<<
@@ -2126,25 +2653,41 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(PyArray
   int __pyx_t_1;
   __Pyx_SetupRefcountContext("assert_like");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":162
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":164
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  * cdef int assert_like(np.ndarray arr1, np.ndarray arr2) except -1:
  *     assert_same_dtype(arr1, arr2)             # <<<<<<<<<<<<<<
  *     assert_same_shape(arr1, arr2)
  *     return 1
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype(__pyx_v_arr1, __pyx_v_arr2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 162; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":163
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype(__pyx_v_arr1, __pyx_v_arr2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 164; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":165
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int assert_like(np.ndarray arr1, np.ndarray arr2) except -1:
  *     assert_same_dtype(arr1, arr2)
  *     assert_same_shape(arr1, arr2)             # <<<<<<<<<<<<<<
  *     return 1
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_arr1, __pyx_v_arr2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":164
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_arr1, __pyx_v_arr2); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":166
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     assert_same_dtype(arr1, arr2)
  *     assert_same_shape(arr1, arr2)
  *     return 1             # <<<<<<<<<<<<<<
@@ -2164,7 +2707,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(PyArray
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":166
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":168
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return 1
  * 
  * cdef int assert_not_sharing_data(np.ndarray arr1, np.ndarray arr2) except -1:             # <<<<<<<<<<<<<<
@@ -2179,7 +2726,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_
   PyObject *__pyx_t_3 = NULL;
   __Pyx_SetupRefcountContext("assert_not_sharing_data");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":167
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":169
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  * cdef int assert_not_sharing_data(np.ndarray arr1, np.ndarray arr2) except -1:
  *     if arr1.data == arr2.data:             # <<<<<<<<<<<<<<
@@ -2189,29 +2740,50 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_
   __pyx_t_1 = (__pyx_v_arr1->data == __pyx_v_arr2->data);
   if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":168
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":170
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int assert_not_sharing_data(np.ndarray arr1, np.ndarray arr2) except -1:
  *     if arr1.data == arr2.data:
  *         raise ValueError('In place operation not supported. Make sure \             # <<<<<<<<<<<<<<
  *                           the out array is not just a view of src array')
  *     return 1
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_56);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_56);
     __Pyx_GIVEREF(__pyx_kp_56);
     __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_58);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_58);
+    __Pyx_GIVEREF(__pyx_kp_58);
+    __pyx_t_3 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     __Pyx_GOTREF(__pyx_t_3);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_3, 0, 0);
     __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 168; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     goto __pyx_L3;
   }
   __pyx_L3:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":170
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":172
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         raise ValueError('In place operation not supported. Make sure \
  *                           the out array is not just a view of src array')
  *     return 1             # <<<<<<<<<<<<<<
@@ -2233,7 +2805,11 @@ static  int __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":175
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":177
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * # NumPy array convienences
  * #-----------------------------------------------------------------------------
  * cdef np.ndarray new_array(int ndim, np.npy_intp* shape, dtype):             # <<<<<<<<<<<<<<
@@ -2246,7 +2822,11 @@ static  PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra
   PyObject *__pyx_t_1 = NULL;
   __Pyx_SetupRefcountContext("new_array");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":177
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":179
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef np.ndarray new_array(int ndim, np.npy_intp* shape, dtype):
  *     # need to incref because numpy will apprently steal a dtype reference
  *     Py_INCREF(<object>dtype)             # <<<<<<<<<<<<<<
@@ -2255,7 +2835,11 @@ static  PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra
  */
   Py_INCREF(__pyx_v_dtype);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":178
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":180
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     # need to incref because numpy will apprently steal a dtype reference
  *     Py_INCREF(<object>dtype)
  *     return PyArray_Empty(ndim, shape, dtype, 0)             # <<<<<<<<<<<<<<
@@ -2263,9 +2847,15 @@ static  PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra
  * cdef np.ndarray new_array_like(np.ndarray arr):
  */
   __Pyx_XDECREF(((PyObject *)__pyx_r));
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = PyArray_Empty(__pyx_v_ndim, __pyx_v_shape, __pyx_v_dtype, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_1 = PyArray_Empty(__pyx_v_ndim, __pyx_v_shape, __pyx_v_dtype, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  if (!(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   __pyx_r = ((PyArrayObject *)__pyx_t_1);
   __pyx_t_1 = 0;
   goto __pyx_L0;
@@ -2282,7 +2872,11 @@ static  PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":180
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":182
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return PyArray_Empty(ndim, shape, dtype, 0)
  * 
  * cdef np.ndarray new_array_like(np.ndarray arr):             # <<<<<<<<<<<<<<
@@ -2296,19 +2890,31 @@ static  PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra
   PyObject *__pyx_t_2 = NULL;
   __Pyx_SetupRefcountContext("new_array_like");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":182
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":184
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef np.ndarray new_array_like(np.ndarray arr):
  *     # need to incref because numpy will apprently steal a dtype reference
  *     Py_INCREF(<object>arr.dtype)             # <<<<<<<<<<<<<<
  *     return PyArray_Empty(arr.ndim, arr.shape, arr.dtype, 0)
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   __Pyx_GOTREF(__pyx_t_1);
   Py_INCREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":183
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":185
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     # need to incref because numpy will apprently steal a dtype reference
  *     Py_INCREF(<object>arr.dtype)
  *     return PyArray_Empty(arr.ndim, arr.shape, arr.dtype, 0)             # <<<<<<<<<<<<<<
@@ -2316,12 +2922,21 @@ static  PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra
  * cdef np.ndarray new_array_like_diff_dtype(np.ndarray arr, dtype):
  */
   __Pyx_XDECREF(((PyObject *)__pyx_r));
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyArray_Empty(__pyx_v_arr->nd, __pyx_v_arr->dimensions, __pyx_t_1, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   if (!(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_1 = PyObject_GetAttr(((PyObject *)__pyx_v_arr), __pyx_kp_dtype); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_t_2 = PyArray_Empty(__pyx_v_arr->nd, __pyx_v_arr->dimensions, __pyx_t_1, 0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  if (!(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 185; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   __pyx_r = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
   goto __pyx_L0;
@@ -2339,7 +2954,11 @@ static  PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":185
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":187
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return PyArray_Empty(arr.ndim, arr.shape, arr.dtype, 0)
  * 
  * cdef np.ndarray new_array_like_diff_dtype(np.ndarray arr, dtype):             # <<<<<<<<<<<<<<
@@ -2352,7 +2971,11 @@ static  PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra
   PyObject *__pyx_t_1 = NULL;
   __Pyx_SetupRefcountContext("new_array_like_diff_dtype");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":187
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":189
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef np.ndarray new_array_like_diff_dtype(np.ndarray arr, dtype):
  *     # need to incref because numpy will apprently steal a dtype reference
  *     Py_INCREF(<object>dtype)             # <<<<<<<<<<<<<<
@@ -2361,7 +2984,11 @@ static  PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra
  */
   Py_INCREF(__pyx_v_dtype);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":188
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":190
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     # need to incref because numpy will apprently steal a dtype reference
  *     Py_INCREF(<object>dtype)
  *     return PyArray_Empty(arr.ndim, arr.shape, dtype, 0)             # <<<<<<<<<<<<<<
@@ -2369,9 +2996,15 @@ static  PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra
  * cdef np.npy_intp* clone_array_shape(np.ndarray arr):
  */
   __Pyx_XDECREF(((PyObject *)__pyx_r));
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = PyArray_Empty(__pyx_v_arr->nd, __pyx_v_arr->dimensions, __pyx_v_dtype, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   if (!(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_1 = PyArray_Empty(__pyx_v_arr->nd, __pyx_v_arr->dimensions, __pyx_v_dtype, 0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  if (!(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   __pyx_r = ((PyArrayObject *)__pyx_t_1);
   __pyx_t_1 = 0;
   goto __pyx_L0;
@@ -2388,7 +3021,11 @@ static  PyArrayObject *__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_arra
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":190
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":192
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return PyArray_Empty(arr.ndim, arr.shape, dtype, 0)
  * 
  * cdef np.npy_intp* clone_array_shape(np.ndarray arr):             # <<<<<<<<<<<<<<
@@ -2404,7 +3041,11 @@ static  npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s
   int __pyx_t_1;
   __Pyx_SetupRefcountContext("clone_array_shape");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":192
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":194
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef np.npy_intp* clone_array_shape(np.ndarray arr):
  *     # make sure you call PyMem_Free after you're done with the shape
  *     cdef int ndim = arr.ndim             # <<<<<<<<<<<<<<
@@ -2413,7 +3054,11 @@ static  npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s
  */
   __pyx_v_ndim = __pyx_v_arr->nd;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":194
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":196
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef int ndim = arr.ndim
  *     cdef np.npy_intp* shape = <np.npy_intp*>PyMem_Malloc(
  *         ndim * sizeof(np.npy_intp))             # <<<<<<<<<<<<<<
@@ -2422,7 +3067,11 @@ static  npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s
  */
   __pyx_v_shape = ((npy_intp *)PyMem_Malloc((__pyx_v_ndim * (sizeof(npy_intp)))));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":196
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":198
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         ndim * sizeof(np.npy_intp))
  *     cdef int i
  *     for i in range(ndim):             # <<<<<<<<<<<<<<
@@ -2432,7 +3081,11 @@ static  npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s
   for (__pyx_t_1 = 0; __pyx_t_1 < __pyx_v_ndim; __pyx_t_1+=1) {
     __pyx_v_i = __pyx_t_1;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":197
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":199
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef int i
  *     for i in range(ndim):
  *         shape[i] = arr.shape[i]             # <<<<<<<<<<<<<<
@@ -2442,7 +3095,11 @@ static  npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s
     (__pyx_v_shape[__pyx_v_i]) = (__pyx_v_arr->dimensions[__pyx_v_i]);
   }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":198
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":200
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     for i in range(ndim):
  *         shape[i] = arr.shape[i]
  *     return shape             # <<<<<<<<<<<<<<
@@ -2458,7 +3115,11 @@ static  npy_intp *__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_s
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":200
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":202
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return shape
  * 
  * cdef np.npy_intp get_array_nbytes(np.ndarray arr):             # <<<<<<<<<<<<<<
@@ -2471,7 +3132,11 @@ static  npy_intp __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_array_nbyt
   npy_intp __pyx_r;
   __Pyx_SetupRefcountContext("get_array_nbytes");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":201
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":203
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  * cdef np.npy_intp get_array_nbytes(np.ndarray arr):
  *     cdef np.npy_intp nbytes = np.PyArray_NBYTES(arr)             # <<<<<<<<<<<<<<
@@ -2480,7 +3145,11 @@ static  npy_intp __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_array_nbyt
  */
   __pyx_v_nbytes = PyArray_NBYTES(__pyx_v_arr);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":202
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":204
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef np.npy_intp get_array_nbytes(np.ndarray arr):
  *     cdef np.npy_intp nbytes = np.PyArray_NBYTES(arr)
  *     return nbytes             # <<<<<<<<<<<<<<
@@ -2496,7 +3165,11 @@ static  npy_intp __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_array_nbyt
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":207
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":209
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * # OpenCV convienences
  * #-------------------------------------------------------------------------------
  * cdef CvPoint2D32f* array_as_cvPoint2D32f_ptr(np.ndarray arr):             # <<<<<<<<<<<<<<
@@ -2509,7 +3182,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx
   struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx_r;
   __Pyx_SetupRefcountContext("array_as_cvPoint2D32f_ptr");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":209
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":211
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef CvPoint2D32f* array_as_cvPoint2D32f_ptr(np.ndarray arr):
  *     cdef CvPoint2D32f* point2Darr
  *     point2Darr = <CvPoint2D32f*>arr.data             # <<<<<<<<<<<<<<
@@ -2518,7 +3195,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx
  */
   __pyx_v_point2Darr = ((struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *)__pyx_v_arr->data);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":210
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":212
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef CvPoint2D32f* point2Darr
  *     point2Darr = <CvPoint2D32f*>arr.data
  *     return point2Darr             # <<<<<<<<<<<<<<
@@ -2534,7 +3215,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *__pyx
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":212
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":214
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return point2Darr
  * 
  * cdef CvTermCriteria get_cvTermCriteria(int iterations, double epsilon):             # <<<<<<<<<<<<<<
@@ -2552,7 +3237,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
   int __pyx_t_3;
   __Pyx_SetupRefcountContext("get_cvTermCriteria");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":214
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":216
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef CvTermCriteria get_cvTermCriteria(int iterations, double epsilon):
  *     cdef CvTermCriteria crit
  *     if iterations and epsilon:             # <<<<<<<<<<<<<<
@@ -2566,13 +3255,18 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
   }
   if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":215
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":217
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef CvTermCriteria crit
  *     if iterations and epsilon:
  *         crit.type = <int>(CV_TERMCRIT_ITER | CV_TERMCRIT_EPS)             # <<<<<<<<<<<<<<
  *         crit.max_iter = iterations
  *         crit.epsilon = epsilon
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_TERMCRIT_ITER); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 215; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_1);
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_TERMCRIT_EPS); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 215; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -2586,6 +3280,21 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
     __pyx_v_crit.type = ((int)__pyx_t_3);
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":216
+=======
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_TERMCRIT_ITER); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_TERMCRIT_EPS); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_2);
+    __pyx_t_2 = PyNumber_Or(__pyx_1, __pyx_2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+    __pyx_t_3 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 217; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+    __pyx_v_crit.type = ((int)__pyx_t_3);
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":218
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     if iterations and epsilon:
  *         crit.type = <int>(CV_TERMCRIT_ITER | CV_TERMCRIT_EPS)
  *         crit.max_iter = iterations             # <<<<<<<<<<<<<<
@@ -2594,7 +3303,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
  */
     __pyx_v_crit.max_iter = __pyx_v_iterations;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":217
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":219
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         crit.type = <int>(CV_TERMCRIT_ITER | CV_TERMCRIT_EPS)
  *         crit.max_iter = iterations
  *         crit.epsilon = epsilon             # <<<<<<<<<<<<<<
@@ -2605,7 +3318,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
     goto __pyx_L3;
   }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":218
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":220
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         crit.max_iter = iterations
  *         crit.epsilon = epsilon
  *     elif iterations and not epsilon:             # <<<<<<<<<<<<<<
@@ -2619,13 +3336,18 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
   }
   if (__pyx_t_1) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":219
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":221
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         crit.epsilon = epsilon
  *     elif iterations and not epsilon:
  *         crit.type = <int>CV_TERMCRIT_ITER             # <<<<<<<<<<<<<<
  *         crit.max_iter = iterations
  *         crit.epsilon = 0.
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_TERMCRIT_ITER); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_1);
     __pyx_t_3 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -2633,6 +3355,15 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
     __pyx_v_crit.type = ((int)__pyx_t_3);
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":220
+=======
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_TERMCRIT_ITER); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_3 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_v_crit.type = ((int)__pyx_t_3);
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":222
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     elif iterations and not epsilon:
  *         crit.type = <int>CV_TERMCRIT_ITER
  *         crit.max_iter = iterations             # <<<<<<<<<<<<<<
@@ -2641,7 +3372,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
  */
     __pyx_v_crit.max_iter = __pyx_v_iterations;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":221
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":223
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         crit.type = <int>CV_TERMCRIT_ITER
  *         crit.max_iter = iterations
  *         crit.epsilon = 0.             # <<<<<<<<<<<<<<
@@ -2653,13 +3388,18 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":223
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":225
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         crit.epsilon = 0.
  *     else:
  *         crit.type = <int>CV_TERMCRIT_EPS             # <<<<<<<<<<<<<<
  *         crit.max_iter = 0
  *         crit.epsilon = epsilon
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_TERMCRIT_EPS); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_2);
     __pyx_t_3 = __Pyx_PyInt_AsInt(__pyx_2); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -2667,6 +3407,15 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
     __pyx_v_crit.type = ((int)__pyx_t_3);
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":224
+=======
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_TERMCRIT_EPS); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_2);
+    __pyx_t_3 = __Pyx_PyInt_AsInt(__pyx_2); if (unlikely((__pyx_t_3 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 225; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+    __pyx_v_crit.type = ((int)__pyx_t_3);
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":226
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     else:
  *         crit.type = <int>CV_TERMCRIT_EPS
  *         crit.max_iter = 0             # <<<<<<<<<<<<<<
@@ -2675,7 +3424,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
  */
     __pyx_v_crit.max_iter = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":225
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":227
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         crit.type = <int>CV_TERMCRIT_EPS
  *         crit.max_iter = 0
  *         crit.epsilon = epsilon             # <<<<<<<<<<<<<<
@@ -2686,7 +3439,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
   }
   __pyx_L3:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":226
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":228
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         crit.max_iter = 0
  *         crit.epsilon = epsilon
  *     return crit             # <<<<<<<<<<<<<<
@@ -2707,7 +3464,11 @@ static  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria __py
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":239
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":241
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *                     ctypes.addressof(cv.cvReleaseStructuringElement))[0]
  * 
  * cdef IplConvKernel* get_IplConvKernel_ptr_from_array(np.ndarray arr, anchor) \             # <<<<<<<<<<<<<<
@@ -2731,48 +3492,82 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
   int __pyx_t_5;
   __Pyx_SetupRefcountContext("get_IplConvKernel_ptr_from_array");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":242
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":244
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     except NULL:
  *     # make sure you call free_IplConvKernel you're done with the kernel
  *     validate_array(arr)             # <<<<<<<<<<<<<<
  *     assert_ndims(arr, [2])
  *     assert_dtype(arr, [INT32])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_arr); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 242; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":243
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_arr); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":245
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     # make sure you call free_IplConvKernel you're done with the kernel
  *     validate_array(arr)
  *     assert_ndims(arr, [2])             # <<<<<<<<<<<<<<
  *     assert_dtype(arr, [INT32])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 243; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 245; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_2);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_2);
   __Pyx_GIVEREF(__pyx_int_2);
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_arr, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 243; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":244
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_arr, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 245; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":246
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     validate_array(arr)
  *     assert_ndims(arr, [2])
  *     assert_dtype(arr, [INT32])             # <<<<<<<<<<<<<<
  * 
  *     cdef int rows
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
   __pyx_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_arr, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 244; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":250
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_arr, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":252
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef int anchorx
  *     cdef int anchory
  *     if anchor is not None:             # <<<<<<<<<<<<<<
@@ -2782,7 +3577,11 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
   __pyx_t_3 = (__pyx_v_anchor != Py_None);
   if (__pyx_t_3) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":251
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":253
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef int anchory
  *     if anchor is not None:
  *         assert len(anchor) == 2, 'anchor must be (x, y) tuple'             # <<<<<<<<<<<<<<
@@ -2790,6 +3589,7 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
  *         anchory = <int>anchor[1]
  */
     #ifndef PYREX_WITHOUT_ASSERTIONS
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_t_4 = PyObject_Length(__pyx_v_anchor); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 251; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     if (unlikely(!(__pyx_t_4 == 2))) {
       PyErr_SetObject(PyExc_AssertionError, __pyx_kp_57);
@@ -2798,12 +3598,23 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
     #endif
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":252
+=======
+    __pyx_t_4 = PyObject_Length(__pyx_v_anchor); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (unlikely(!(__pyx_t_4 == 2))) {
+      PyErr_SetObject(PyExc_AssertionError, __pyx_kp_59);
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    }
+    #endif
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":254
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     if anchor is not None:
  *         assert len(anchor) == 2, 'anchor must be (x, y) tuple'
  *         anchorx = <int>anchor[0]             # <<<<<<<<<<<<<<
  *         anchory = <int>anchor[1]
  *         assert (anchorx < arr.shape[1]) and (anchorx >= 0) \
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_1 = __Pyx_GetItemInt(__pyx_v_anchor, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_1);
     __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -2811,12 +3622,22 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
     __pyx_v_anchorx = ((int)__pyx_t_1);
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":253
+=======
+    __pyx_1 = __Pyx_GetItemInt(__pyx_v_anchor, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_v_anchorx = ((int)__pyx_t_1);
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":255
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         assert len(anchor) == 2, 'anchor must be (x, y) tuple'
  *         anchorx = <int>anchor[0]
  *         anchory = <int>anchor[1]             # <<<<<<<<<<<<<<
  *         assert (anchorx < arr.shape[1]) and (anchorx >= 0) \
  *             and (anchory < arr.shape[0]) and (anchory >= 0), \
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_1 = __Pyx_GetItemInt(__pyx_v_anchor, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_1);
     __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -2824,6 +3645,15 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
     __pyx_v_anchory = ((int)__pyx_t_1);
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":254
+=======
+    __pyx_1 = __Pyx_GetItemInt(__pyx_v_anchor, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_v_anchory = ((int)__pyx_t_1);
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":256
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         anchorx = <int>anchor[0]
  *         anchory = <int>anchor[1]
  *         assert (anchorx < arr.shape[1]) and (anchorx >= 0) \             # <<<<<<<<<<<<<<
@@ -2833,7 +3663,11 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
     #ifndef PYREX_WITHOUT_ASSERTIONS
     if ((__pyx_v_anchorx < (__pyx_v_arr->dimensions[1]))) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":255
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":257
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         anchory = <int>anchor[1]
  *         assert (anchorx < arr.shape[1]) and (anchorx >= 0) \
  *             and (anchory < arr.shape[0]) and (anchory >= 0), \             # <<<<<<<<<<<<<<
@@ -2856,22 +3690,35 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
     }
     if (unlikely(!__pyx_t_3)) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":256
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":258
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         assert (anchorx < arr.shape[1]) and (anchorx >= 0) \
  *             and (anchory < arr.shape[0]) and (anchory >= 0), \
  *             'anchor point must be inside kernel'             # <<<<<<<<<<<<<<
  *     else:
  *         anchorx = <int>(arr.shape[1] / 2.)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
       PyErr_SetObject(PyExc_AssertionError, __pyx_kp_58);
       {__pyx_filename = __pyx_f[0]; __pyx_lineno = 254; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      PyErr_SetObject(PyExc_AssertionError, __pyx_kp_60);
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 256; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     }
     #endif
     goto __pyx_L3;
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":258
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":260
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *             'anchor point must be inside kernel'
  *     else:
  *         anchorx = <int>(arr.shape[1] / 2.)             # <<<<<<<<<<<<<<
@@ -2880,7 +3727,11 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
  */
     __pyx_v_anchorx = ((int)((__pyx_v_arr->dimensions[1]) / 2.0));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":259
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":261
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     else:
  *         anchorx = <int>(arr.shape[1] / 2.)
  *         anchory = <int>(arr.shape[0] / 2.)             # <<<<<<<<<<<<<<
@@ -2891,7 +3742,11 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
   }
   __pyx_L3:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":261
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":263
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *         anchory = <int>(arr.shape[0] / 2.)
  * 
  *     rows = arr.shape[0]             # <<<<<<<<<<<<<<
@@ -2900,7 +3755,11 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
  */
   __pyx_v_rows = (__pyx_v_arr->dimensions[0]);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":262
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":264
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  *     rows = arr.shape[0]
  *     cols = arr.shape[1]             # <<<<<<<<<<<<<<
@@ -2909,7 +3768,11 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
  */
   __pyx_v_cols = (__pyx_v_arr->dimensions[1]);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":264
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":266
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cols = arr.shape[1]
  * 
  *     cdef int* values = <int*>arr.data             # <<<<<<<<<<<<<<
@@ -2918,13 +3781,18 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
  */
   __pyx_v_values = ((int *)__pyx_v_arr->data);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":271
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":273
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     cdef IplConvKernel* iplkernel = \
  *             c_cvCreateStructuringElementEx(cols, rows, anchorx, anchory,
  *                                            CV_SHAPE_CUSTOM, values)             # <<<<<<<<<<<<<<
  * 
  *     return iplkernel
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_SHAPE_CUSTOM); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 271; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 271; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -2932,6 +3800,15 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
   __pyx_v_iplkernel = __pyx_v_7scikits_5image_6opencv_14opencv_backend_c_cvCreateStructuringElementEx(__pyx_v_cols, __pyx_v_rows, __pyx_v_anchorx, __pyx_v_anchory, __pyx_t_1, __pyx_v_values);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":273
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_SHAPE_CUSTOM); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 273; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 273; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_iplkernel = __pyx_v_7scikits_5image_6opencv_14opencv_backend_c_cvCreateStructuringElementEx(__pyx_v_cols, __pyx_v_rows, __pyx_v_anchorx, __pyx_v_anchory, __pyx_t_1, __pyx_v_values);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":275
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *                                            CV_SHAPE_CUSTOM, values)
  * 
  *     return iplkernel             # <<<<<<<<<<<<<<
@@ -2953,7 +3830,11 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":275
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":277
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *     return iplkernel
  * 
  * cdef void free_IplConvKernel(IplConvKernel* iplkernel):             # <<<<<<<<<<<<<<
@@ -2964,7 +3845,11 @@ static  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_f_7sc
 static  void __pyx_f_7scikits_5image_6opencv_14opencv_backend_free_IplConvKernel(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_v_iplkernel) {
   __Pyx_SetupRefcountContext("free_IplConvKernel");
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":276
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":278
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  * cdef void free_IplConvKernel(IplConvKernel* iplkernel):
  *     c_cvReleaseStructuringElement(&iplkernel)             # <<<<<<<<<<<<<<
@@ -4606,6 +5491,7 @@ static int __pyx_import_star_set(PyObject *o, PyObject* py_name, char *name) {
   }
   if (0);
   else if (__Pyx_StrEq(name, "IPL_DEPTH_8U")) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8U = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8U == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
     Py_DECREF(o);
   }
@@ -4619,26 +5505,56 @@ static int __pyx_import_star_set(PyObject *o, PyObject* py_name, char *name) {
   }
   else if (__Pyx_StrEq(name, "IPL_DEPTH_32F")) {
     __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32F = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32F == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+=======
+    __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8U = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8U == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+    Py_DECREF(o);
+  }
+  else if (__Pyx_StrEq(name, "IPL_DEPTH_SIGN")) {
+    __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_SIGN = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_SIGN == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+    Py_DECREF(o);
+  }
+  else if (__Pyx_StrEq(name, "IPL_DEPTH_32S")) {
+    __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32S = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32S == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+    Py_DECREF(o);
+  }
+  else if (__Pyx_StrEq(name, "IPL_DEPTH_32F")) {
+    __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32F = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32F == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     Py_DECREF(o);
   }
   else if (__Pyx_StrEq(name, "c_cvGetMat")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvGetMat to scikits.image.opencv.opencv_backend.cvGetMatPtr");
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "IPL_DEPTH_8S")) {
     __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8S = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8S == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "IPL_DEPTH_8S")) {
+    __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8S = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8S == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 28; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     Py_DECREF(o);
   }
   else if (__Pyx_StrEq(name, "c_cvReleaseStructuringElement")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvReleaseStructuringElement to scikits.image.opencv.opencv_backend.cvReleaseStructuringElementPtr");
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "IPL_DEPTH_64F")) {
     __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_64F = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_64F == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "IPL_DEPTH_64F")) {
+    __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_64F = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_64F == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     Py_DECREF(o);
   }
   else if (__Pyx_StrEq(name, "c_cvCreateStructuringElementEx")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCreateStructuringElementEx to scikits.image.opencv.opencv_backend.cvCreateStructuringElementExPtr");
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "IPL_DEPTH_16S")) {
@@ -4647,6 +5563,20 @@ static int __pyx_import_star_set(PyObject *o, PyObject* py_name, char *name) {
   }
   else if (__Pyx_StrEq(name, "IPLIMAGE_SIZE")) {
     __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPLIMAGE_SIZE = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPLIMAGE_SIZE == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "IPL_DEPTH_16U")) {
+    __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_16U = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_16U == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 29; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+    Py_DECREF(o);
+  }
+  else if (__Pyx_StrEq(name, "IPL_DEPTH_16S")) {
+    __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_16S = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_16S == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 30; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+    Py_DECREF(o);
+  }
+  else if (__Pyx_StrEq(name, "IPLIMAGE_SIZE")) {
+    __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPLIMAGE_SIZE = __Pyx_PyInt_AsInt(o); if ((__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPLIMAGE_SIZE == (int)-1) && PyErr_Occurred()) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L2_error;};
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
     Py_DECREF(o);
   }
   else {
@@ -4798,11 +5728,21 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_kp_41, __pyx_k_41, sizeof(__pyx_k_41), 1, 1, 1},
   {&__pyx_kp_42, __pyx_k_42, sizeof(__pyx_k_42), 0, 1, 0},
   {&__pyx_kp_43, __pyx_k_43, sizeof(__pyx_k_43), 1, 1, 1},
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   {&__pyx_kp__ipltypes, __pyx_k__ipltypes, sizeof(__pyx_k__ipltypes), 1, 1, 1},
   {&__pyx_kp_addressof, __pyx_k_addressof, sizeof(__pyx_k_addressof), 1, 1, 1},
   {&__pyx_kp_cvGetMat, __pyx_k_cvGetMat, sizeof(__pyx_k_cvGetMat), 1, 1, 1},
   {&__pyx_kp_44, __pyx_k_44, sizeof(__pyx_k_44), 1, 1, 1},
   {&__pyx_kp_45, __pyx_k_45, sizeof(__pyx_k_45), 1, 1, 1},
+=======
+  {&__pyx_kp_44, __pyx_k_44, sizeof(__pyx_k_44), 0, 1, 0},
+  {&__pyx_kp_45, __pyx_k_45, sizeof(__pyx_k_45), 1, 1, 1},
+  {&__pyx_kp__ipltypes, __pyx_k__ipltypes, sizeof(__pyx_k__ipltypes), 1, 1, 1},
+  {&__pyx_kp_addressof, __pyx_k_addressof, sizeof(__pyx_k_addressof), 1, 1, 1},
+  {&__pyx_kp_cvGetMat, __pyx_k_cvGetMat, sizeof(__pyx_k_cvGetMat), 1, 1, 1},
+  {&__pyx_kp_46, __pyx_k_46, sizeof(__pyx_k_46), 1, 1, 1},
+  {&__pyx_kp_47, __pyx_k_47, sizeof(__pyx_k_47), 1, 1, 1},
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   {&__pyx_kp_dtype, __pyx_k_dtype, sizeof(__pyx_k_dtype), 1, 1, 1},
   {&__pyx_kp_nbytes, __pyx_k_nbytes, sizeof(__pyx_k_nbytes), 1, 1, 1},
   {&__pyx_kp_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 1, 1, 1},
@@ -4810,8 +5750,11 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_kp_CV_TERMCRIT_ITER, __pyx_k_CV_TERMCRIT_ITER, sizeof(__pyx_k_CV_TERMCRIT_ITER), 1, 1, 1},
   {&__pyx_kp_CV_TERMCRIT_EPS, __pyx_k_CV_TERMCRIT_EPS, sizeof(__pyx_k_CV_TERMCRIT_EPS), 1, 1, 1},
   {&__pyx_kp_CV_SHAPE_CUSTOM, __pyx_k_CV_SHAPE_CUSTOM, sizeof(__pyx_k_CV_SHAPE_CUSTOM), 1, 1, 1},
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   {&__pyx_kp_46, __pyx_k_46, sizeof(__pyx_k_46), 0, 0, 0},
   {&__pyx_kp_47, __pyx_k_47, sizeof(__pyx_k_47), 0, 0, 0},
+=======
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   {&__pyx_kp_48, __pyx_k_48, sizeof(__pyx_k_48), 0, 0, 0},
   {&__pyx_kp_49, __pyx_k_49, sizeof(__pyx_k_49), 0, 0, 0},
   {&__pyx_kp_50, __pyx_k_50, sizeof(__pyx_k_50), 0, 0, 0},
@@ -4823,6 +5766,11 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_kp_56, __pyx_k_56, sizeof(__pyx_k_56), 0, 0, 0},
   {&__pyx_kp_57, __pyx_k_57, sizeof(__pyx_k_57), 0, 0, 0},
   {&__pyx_kp_58, __pyx_k_58, sizeof(__pyx_k_58), 0, 0, 0},
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
+=======
+  {&__pyx_kp_59, __pyx_k_59, sizeof(__pyx_k_59), 0, 0, 0},
+  {&__pyx_kp_60, __pyx_k_60, sizeof(__pyx_k_60), 0, 0, 0},
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   {&__pyx_kp___getbuffer__, __pyx_k___getbuffer__, sizeof(__pyx_k___getbuffer__), 1, 1, 1},
   {&__pyx_kp___releasebuffer__, __pyx_k___releasebuffer__, sizeof(__pyx_k___releasebuffer__), 1, 1, 1},
   {&__pyx_kp_info, __pyx_k_info, sizeof(__pyx_k_info), 1, 1, 1},
@@ -4839,8 +5787,13 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {0, 0, 0, 0, 0, 0}
 };
 static int __Pyx_InitCachedBuiltins(void) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_kp_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 113; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_kp_range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_kp_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_kp_range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 198; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_kp_RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 706; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   return 0;
   __pyx_L1_error:;
@@ -5028,7 +5981,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
  * # dtype itself....
  * UINT8 = np.dtype('uint8')             # <<<<<<<<<<<<<<
  * INT8 = np.dtype('int8')
- * INT16 = np.dtype('int16')
+ * UINT16 = np.dtype('uint16')
  */
   __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_1));
@@ -5045,9 +5998,44 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
  * # dtype itself....
  * UINT8 = np.dtype('uint8')
  * INT8 = np.dtype('int8')             # <<<<<<<<<<<<<<
+ * UINT16 = np.dtype('uint16')
+ * INT16 = np.dtype('int16')
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_kp_32);
+  PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_kp_32);
+  __Pyx_GIVEREF(__pyx_kp_32);
+  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  if (PyObject_SetAttr(__pyx_m, __pyx_kp_33, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 18; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":19
+ * # dtype itself....
+=======
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_kp_34);
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_34);
+  __Pyx_GIVEREF(__pyx_kp_34);
+  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  if (PyObject_SetAttr(__pyx_m, __pyx_kp_35, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":20
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
+ * UINT8 = np.dtype('uint8')
+ * INT8 = np.dtype('int8')
+ * UINT16 = np.dtype('uint16')             # <<<<<<<<<<<<<<
  * INT16 = np.dtype('int16')
  * INT32 = np.dtype('int32')
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 19; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_kp_34);
@@ -5061,11 +6049,27 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":20
  * UINT8 = np.dtype('uint8')
+=======
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_kp_36);
+  PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_kp_36);
+  __Pyx_GIVEREF(__pyx_kp_36);
+  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  if (PyObject_SetAttr(__pyx_m, __pyx_kp_37, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":21
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * INT8 = np.dtype('int8')
+ * UINT16 = np.dtype('uint16')
  * INT16 = np.dtype('int16')             # <<<<<<<<<<<<<<
  * INT32 = np.dtype('int32')
  * FLOAT32 = np.dtype('float32')
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 20; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_1));
   __Pyx_INCREF(__pyx_kp_36);
@@ -5079,11 +6083,7 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":21
  * INT8 = np.dtype('int8')
- * INT16 = np.dtype('int16')
- * INT32 = np.dtype('int32')             # <<<<<<<<<<<<<<
- * FLOAT32 = np.dtype('float32')
- * FLOAT64 = np.dtype('float64')
- */
+=======
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_kp_38);
@@ -5096,12 +6096,27 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":22
+ * UINT16 = np.dtype('uint16')
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * INT16 = np.dtype('int16')
- * INT32 = np.dtype('int32')
- * FLOAT32 = np.dtype('float32')             # <<<<<<<<<<<<<<
+ * INT32 = np.dtype('int32')             # <<<<<<<<<<<<<<
+ * FLOAT32 = np.dtype('float32')
  * FLOAT64 = np.dtype('float64')
- * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_kp_38);
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_38);
+  __Pyx_GIVEREF(__pyx_kp_38);
+  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  if (PyObject_SetAttr(__pyx_m, __pyx_kp_39, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 21; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":22
+=======
   __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_1));
   __Pyx_INCREF(__pyx_kp_40);
@@ -5114,12 +6129,47 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":23
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
+ * INT16 = np.dtype('int16')
+ * INT32 = np.dtype('int32')
+ * FLOAT32 = np.dtype('float32')             # <<<<<<<<<<<<<<
+ * FLOAT64 = np.dtype('float64')
+ * 
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_kp_40);
+  PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_kp_40);
+  __Pyx_GIVEREF(__pyx_kp_40);
+  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  if (PyObject_SetAttr(__pyx_m, __pyx_kp_41, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 22; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":23
+=======
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_kp_42);
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_42);
+  __Pyx_GIVEREF(__pyx_kp_42);
+  __pyx_t_1 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  if (PyObject_SetAttr(__pyx_m, __pyx_kp_43, __pyx_t_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":24
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * INT32 = np.dtype('int32')
  * FLOAT32 = np.dtype('float32')
  * FLOAT64 = np.dtype('float64')             # <<<<<<<<<<<<<<
  * 
  * cdef int IPL_DEPTH_SIGN = 0x80000000
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 23; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_kp_42);
@@ -5132,6 +6182,20 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":25
+=======
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_kp_44);
+  PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_kp_44);
+  __Pyx_GIVEREF(__pyx_kp_44);
+  __pyx_t_2 = PyObject_Call(((PyObject *)((PyObject*)__pyx_ptype_5numpy_dtype)), ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  if (PyObject_SetAttr(__pyx_m, __pyx_kp_45, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 24; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":26
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * FLOAT64 = np.dtype('float64')
  * 
  * cdef int IPL_DEPTH_SIGN = 0x80000000             # <<<<<<<<<<<<<<
@@ -5140,35 +6204,61 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
  */
   __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_SIGN = 0x80000000;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":26
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":27
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  * cdef int IPL_DEPTH_SIGN = 0x80000000
  * cdef int IPL_DEPTH_8U = 8             # <<<<<<<<<<<<<<
  * cdef int IPL_DEPTH_8S = (IPL_DEPTH_SIGN | 8)
- * cdef int IPL_DEPTH_16S = (IPL_DEPTH_SIGN | 16)
+ * cdef int IPL_DEPTH_16U = 16
  */
   __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8U = 8;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":27
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":28
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int IPL_DEPTH_SIGN = 0x80000000
  * cdef int IPL_DEPTH_8U = 8
  * cdef int IPL_DEPTH_8S = (IPL_DEPTH_SIGN | 8)             # <<<<<<<<<<<<<<
+ * cdef int IPL_DEPTH_16U = 16
  * cdef int IPL_DEPTH_16S = (IPL_DEPTH_SIGN | 16)
- * cdef int IPL_DEPTH_32S = (IPL_DEPTH_SIGN | 32)
  */
   __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8S = (__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_SIGN | 8);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":28
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":29
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int IPL_DEPTH_8U = 8
  * cdef int IPL_DEPTH_8S = (IPL_DEPTH_SIGN | 8)
+ * cdef int IPL_DEPTH_16U = 16             # <<<<<<<<<<<<<<
+ * cdef int IPL_DEPTH_16S = (IPL_DEPTH_SIGN | 16)
+ * cdef int IPL_DEPTH_32S = (IPL_DEPTH_SIGN | 32)
+ */
+  __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_16U = 16;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":30
+ * cdef int IPL_DEPTH_8S = (IPL_DEPTH_SIGN | 8)
+ * cdef int IPL_DEPTH_16U = 16
  * cdef int IPL_DEPTH_16S = (IPL_DEPTH_SIGN | 16)             # <<<<<<<<<<<<<<
  * cdef int IPL_DEPTH_32S = (IPL_DEPTH_SIGN | 32)
  * cdef int IPL_DEPTH_32F = 32
  */
   __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_16S = (__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_SIGN | 16);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":29
  * cdef int IPL_DEPTH_8S = (IPL_DEPTH_SIGN | 8)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":31
+ * cdef int IPL_DEPTH_16U = 16
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int IPL_DEPTH_16S = (IPL_DEPTH_SIGN | 16)
  * cdef int IPL_DEPTH_32S = (IPL_DEPTH_SIGN | 32)             # <<<<<<<<<<<<<<
  * cdef int IPL_DEPTH_32F = 32
@@ -5176,7 +6266,11 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
  */
   __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32S = (__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_SIGN | 32);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":30
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":32
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int IPL_DEPTH_16S = (IPL_DEPTH_SIGN | 16)
  * cdef int IPL_DEPTH_32S = (IPL_DEPTH_SIGN | 32)
  * cdef int IPL_DEPTH_32F = 32             # <<<<<<<<<<<<<<
@@ -5185,7 +6279,11 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
  */
   __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32F = 32;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":31
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":33
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef int IPL_DEPTH_32S = (IPL_DEPTH_SIGN | 32)
  * cdef int IPL_DEPTH_32F = 32
  * cdef int IPL_DEPTH_64F = 64             # <<<<<<<<<<<<<<
@@ -5194,13 +6292,18 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
  */
   __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_64F = 64;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":36
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":38
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * # I'd like a better to associate the IPL data type flag to the proper numpy
  * # types without using a dictionary.
- * _ipltypes = {UINT8: IPL_DEPTH_8U, INT8: IPL_DEPTH_8S, INT16: IPL_DEPTH_16S,             # <<<<<<<<<<<<<<
- *              INT32: IPL_DEPTH_32S, FLOAT32: IPL_DEPTH_32F,
+ * _ipltypes = {UINT8: IPL_DEPTH_8U, INT8: IPL_DEPTH_8S, UINT16: IPL_DEPTH_16U,             # <<<<<<<<<<<<<<
+ *              INT16: IPL_DEPTH_16S, INT32: IPL_DEPTH_32S, FLOAT32: IPL_DEPTH_32F,
  *              FLOAT64: IPL_DEPTH_64F}
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_1 = PyDict_New(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_1));
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_33); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -5226,12 +6329,40 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":37
+=======
+  __pyx_1 = PyDict_New(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_1));
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_33); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyInt_FromLong(__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8U); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  if (PyDict_SetItem(__pyx_1, __pyx_2, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_35); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyInt_FromLong(__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_8S); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  if (PyDict_SetItem(__pyx_1, __pyx_2, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_37); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyInt_FromLong(__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_16U); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  if (PyDict_SetItem(__pyx_1, __pyx_2, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":39
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * # types without using a dictionary.
- * _ipltypes = {UINT8: IPL_DEPTH_8U, INT8: IPL_DEPTH_8S, INT16: IPL_DEPTH_16S,
- *              INT32: IPL_DEPTH_32S, FLOAT32: IPL_DEPTH_32F,             # <<<<<<<<<<<<<<
+ * _ipltypes = {UINT8: IPL_DEPTH_8U, INT8: IPL_DEPTH_8S, UINT16: IPL_DEPTH_16U,
+ *              INT16: IPL_DEPTH_16S, INT32: IPL_DEPTH_32S, FLOAT32: IPL_DEPTH_32F,             # <<<<<<<<<<<<<<
  *              FLOAT64: IPL_DEPTH_64F}
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_t_1 = PyInt_FromLong(__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32S); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -5250,10 +6381,38 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":38
  * _ipltypes = {UINT8: IPL_DEPTH_8U, INT8: IPL_DEPTH_8S, INT16: IPL_DEPTH_16S,
  *              INT32: IPL_DEPTH_32S, FLOAT32: IPL_DEPTH_32F,
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyInt_FromLong(__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_16S); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  if (PyDict_SetItem(__pyx_1, __pyx_2, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyInt_FromLong(__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32S); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  if (PyDict_SetItem(__pyx_1, __pyx_2, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_43); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyInt_FromLong(__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_32F); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  if (PyDict_SetItem(__pyx_1, __pyx_2, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":40
+ * _ipltypes = {UINT8: IPL_DEPTH_8U, INT8: IPL_DEPTH_8S, UINT16: IPL_DEPTH_16U,
+ *              INT16: IPL_DEPTH_16S, INT32: IPL_DEPTH_32S, FLOAT32: IPL_DEPTH_32F,
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  *              FLOAT64: IPL_DEPTH_64F}             # <<<<<<<<<<<<<<
  * 
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_43); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_t_1 = PyInt_FromLong(__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_64F); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -5265,6 +6424,19 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
   __Pyx_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":46
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_45); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyInt_FromLong(__pyx_v_7scikits_5image_6opencv_14opencv_backend_IPL_DEPTH_64F); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  if (PyDict_SetItem(__pyx_1, __pyx_2, __pyx_t_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  if (PyObject_SetAttr(__pyx_m, __pyx_kp__ipltypes, ((PyObject *)__pyx_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":48
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * 
  * 
  * cdef int IPLIMAGE_SIZE = sizeof(IplImage)             # <<<<<<<<<<<<<<
@@ -5273,13 +6445,18 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
  */
   __pyx_v_7scikits_5image_6opencv_14opencv_backend_IPLIMAGE_SIZE = (sizeof(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":53
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":55
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * ctypedef CvMat* (*cvGetMatPtr)(IplImage*, CvMat*, int*, int)
  * cdef cvGetMatPtr c_cvGetMat
  * c_cvGetMat = (<cvGetMatPtr*><size_t>ctypes.addressof(cxcore.cvGetMat))[0]             # <<<<<<<<<<<<<<
  * 
  * cdef void populate_iplimage(np.ndarray arr, IplImage* img):
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_t_1 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -5304,12 +6481,39 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
   __pyx_v_7scikits_5image_6opencv_14opencv_backend_c_cvGetMat = (((__pyx_t_7scikits_5image_6opencv_14opencv_backend_cvGetMatPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":232
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_cxcore); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_cvGetMat); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+  PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  __pyx_t_1 = 0;
+  __pyx_t_1 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __pyx_v_7scikits_5image_6opencv_14opencv_backend_c_cvGetMat = (((__pyx_t_7scikits_5image_6opencv_14opencv_backend_cvGetMatPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":234
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef cvCreateStructuringElementExPtr c_cvCreateStructuringElementEx
  * c_cvCreateStructuringElementEx = (<cvCreateStructuringElementExPtr*><size_t>
  *                     ctypes.addressof(cv.cvCreateStructuringElementEx))[0]             # <<<<<<<<<<<<<<
  * 
  * ctypedef void (*cvReleaseStructuringElementPtr)(IplConvKernel**)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_t_2 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -5334,12 +6538,39 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
   __pyx_v_7scikits_5image_6opencv_14opencv_backend_c_cvCreateStructuringElementEx = (((__pyx_t_7scikits_5image_6opencv_14opencv_backend_cvCreateStructuringElementExPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":237
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_1, __pyx_kp_46); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_3);
+  __Pyx_GIVEREF(__pyx_t_3);
+  __pyx_t_3 = 0;
+  __pyx_t_3 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __pyx_v_7scikits_5image_6opencv_14opencv_backend_c_cvCreateStructuringElementEx = (((__pyx_t_7scikits_5image_6opencv_14opencv_backend_cvCreateStructuringElementExPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_backend.pyx":239
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
  * cdef cvReleaseStructuringElementPtr c_cvReleaseStructuringElement
  * c_cvReleaseStructuringElement = (<cvReleaseStructuringElementPtr*><size_t>
  *                     ctypes.addressof(cv.cvReleaseStructuringElement))[0]             # <<<<<<<<<<<<<<
  * 
  * cdef IplConvKernel* get_IplConvKernel_ptr_from_array(np.ndarray arr, anchor) \
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_backend.c
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_t_3 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -5361,6 +6592,29 @@ PyMODINIT_FUNC PyInit_opencv_backend(void)
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
   __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_47); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_2);
+  __Pyx_GIVEREF(__pyx_t_2);
+  __pyx_t_2 = 0;
+  __pyx_t_2 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_backend.c
   __pyx_v_7scikits_5image_6opencv_14opencv_backend_c_cvReleaseStructuringElement = (((__pyx_t_7scikits_5image_6opencv_14opencv_backend_cvReleaseStructuringElementPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/python_mem.pxd":1
diff --git a/scikits/image/opencv/opencv_backend.pyx b/scikits/image/opencv/opencv_backend.pyx
index d1b602db..f1227bf1 100644
--- a/scikits/image/opencv/opencv_backend.pyx
+++ b/scikits/image/opencv/opencv_backend.pyx
@@ -17,6 +17,7 @@ np.import_array()
 # dtype itself....
 UINT8 = np.dtype('uint8')
 INT8 = np.dtype('int8')
+UINT16 = np.dtype('uint16')
 INT16 = np.dtype('int16')
 INT32 = np.dtype('int32')
 FLOAT32 = np.dtype('float32')
@@ -25,6 +26,7 @@ FLOAT64 = np.dtype('float64')
 cdef int IPL_DEPTH_SIGN = 0x80000000
 cdef int IPL_DEPTH_8U = 8
 cdef int IPL_DEPTH_8S = (IPL_DEPTH_SIGN | 8)
+cdef int IPL_DEPTH_16U = 16
 cdef int IPL_DEPTH_16S = (IPL_DEPTH_SIGN | 16)
 cdef int IPL_DEPTH_32S = (IPL_DEPTH_SIGN | 32)
 cdef int IPL_DEPTH_32F = 32
@@ -33,8 +35,8 @@ cdef int IPL_DEPTH_64F = 64
 
 # I'd like a better to associate the IPL data type flag to the proper numpy
 # types without using a dictionary.
-_ipltypes = {UINT8: IPL_DEPTH_8U, INT8: IPL_DEPTH_8S, INT16: IPL_DEPTH_16S,
-             INT32: IPL_DEPTH_32S, FLOAT32: IPL_DEPTH_32F,
+_ipltypes = {UINT8: IPL_DEPTH_8U, INT8: IPL_DEPTH_8S, UINT16: IPL_DEPTH_16U,
+             INT16: IPL_DEPTH_16S, INT32: IPL_DEPTH_32S, FLOAT32: IPL_DEPTH_32F,
              FLOAT64: IPL_DEPTH_64F}
 
 
diff --git a/scikits/image/opencv/opencv_constants.py b/scikits/image/opencv/opencv_constants.py
index 3d4b0c31..58f05efb 100644
--- a/scikits/image/opencv/opencv_constants.py
+++ b/scikits/image/opencv/opencv_constants.py
@@ -1,6 +1,6 @@
 
 #############################################
-# Image Processing Constants 
+# Image Processing Constants
 ############################################
 
 
@@ -33,6 +33,101 @@ CV_MOP_GRADIENT = 4
 CV_MOP_TOPHAT = 5
 CV_MOP_BLACKHAT = 6
 
+#-------------------------------------------------------------------------------
+# Color Conversion
+#-------------------------------------------------------------------------------
+CV_BGR2BGRA = 0
+CV_RGB2RGBA = CV_BGR2BGRA
+
+CV_BGRA2BGR = 1
+CV_RGBA2RGB = CV_BGRA2BGR
+
+CV_BGR2RGBA = 2
+CV_RGB2BGRA = CV_BGR2RGBA
+
+CV_RGBA2BGR = 3
+CV_BGRA2RGB = CV_RGBA2BGR
+
+CV_BGR2RGB = 4
+CV_RGB2BGR = CV_BGR2RGB
+
+CV_BGRA2RGBA = 5
+CV_RGBA2BGRA = CV_BGRA2RGBA
+
+CV_BGR2GRAY = 6
+CV_RGB2GRAY = 7
+CV_GRAY2BGR = 8
+CV_GRAY2RGB = CV_GRAY2BGR
+CV_GRAY2BGRA = 9
+CV_GRAY2RGBA = CV_GRAY2BGRA
+CV_BGRA2GRAY = 10
+CV_RGBA2GRAY = 11
+
+CV_BGR2BGR565 = 12
+CV_RGB2BGR565 = 13
+CV_BGR5652BGR = 14
+CV_BGR5652RGB = 15
+CV_BGRA2BGR565 = 16
+CV_RGBA2BGR565 = 17
+CV_BGR5652BGRA = 18
+CV_BGR5652RGBA = 19
+
+CV_GRAY2BGR565 = 20
+CV_BGR5652GRAY = 21
+
+CV_BGR2BGR555 = 22
+CV_RGB2BGR555 = 23
+CV_BGR5552BGR = 24
+CV_BGR5552RGB = 25
+CV_BGRA2BGR555 = 26
+CV_RGBA2BGR555 = 27
+CV_BGR5552BGRA = 28
+CV_BGR5552RGBA = 29
+
+CV_GRAY2BGR555 = 30
+CV_BGR5552GRAY = 31
+
+CV_BGR2XYZ = 32
+CV_RGB2XYZ = 33
+CV_XYZ2BGR = 34
+CV_XYZ2RGB = 35
+
+CV_BGR2YCrCb = 36
+CV_RGB2YCrCb = 37
+CV_YCrCb2BGR = 38
+CV_YCrCb2RGB = 39
+
+CV_BGR2HSV = 40
+CV_RGB2HSV = 41
+
+CV_BGR2Lab = 44
+CV_RGB2Lab = 45
+
+CV_BayerBG2BGR = 46
+CV_BayerGB2BGR = 47
+CV_BayerRG2BGR = 48
+CV_BayerGR2BGR = 49
+
+CV_BayerBG2RGB = CV_BayerRG2BGR
+CV_BayerGB2RGB = CV_BayerGR2BGR
+CV_BayerRG2RGB = CV_BayerBG2BGR
+CV_BayerGR2RGB = CV_BayerGB2BGR
+
+CV_BGR2Luv = 50
+CV_RGB2Luv = 51
+CV_BGR2HLS = 52
+CV_RGB2HLS = 53
+
+CV_HSV2BGR = 54
+CV_HSV2RGB = 55
+
+CV_Lab2BGR = 56
+CV_Lab2RGB = 57
+CV_Luv2BGR = 58
+CV_Luv2RGB = 59
+CV_HLS2BGR = 60
+CV_HLS2RGB = 61
+
 #########################
 # Calibration Constants #
 #########################
diff --git a/scikits/image/opencv/opencv_cv.c b/scikits/image/opencv/opencv_cv.c
index 01217fb8..eec75973 100644
--- a/scikits/image/opencv/opencv_cv.c
+++ b/scikits/image/opencv/opencv_cv.c
@@ -1,4 +1,8 @@
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* Generated by Cython 0.11.3 on Sat Oct 24 13:08:30 2009 */
+=======
+/* Generated by Cython 0.11.3 on Sat Oct 24 14:54:22 2009 */
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
@@ -380,6 +384,8 @@ static INLINE PyObject *__Pyx_GetItemInt_Fast(PyObject *o, Py_ssize_t i, int fit
     return r;
 }
 
+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+
 static INLINE void __Pyx_RaiseNoneNotIterableError(void);
 
 static INLINE void __Pyx_RaiseNeedMoreValuesError(Py_ssize_t index);
@@ -391,6 +397,9 @@ static void __Pyx_UnpackTupleError(PyObject *, Py_ssize_t index); /*proto*/
 static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed,
     const char *name, int exact); /*proto*/
 
+static INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb); /*proto*/
+static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb); /*proto*/
+
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list); /*proto*/
 
 static PyObject *__Pyx_GetName(PyObject *dict, PyObject *name); /*proto*/
@@ -418,6 +427,17 @@ static INLINE PyObject* __Pyx_PyObject_Append(PyObject* L, PyObject* x) {
     }
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+=======
+static int __Pyx_Print(PyObject *, int); /*proto*/
+#if PY_MAJOR_VERSION >= 3
+static PyObject* __pyx_print = 0;
+static PyObject* __pyx_print_kwargs = 0;
+#endif
+
+static int __Pyx_PrintOne(PyObject *o); /*proto*/
+
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 static INLINE PyObject *__Pyx_PyInt_to_py_npy_intp(npy_intp);
 
 #if __PYX_USE_C99_COMPLEX
@@ -934,6 +954,11 @@ typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFilter2DPtr)(__pyx_t
 
 typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvIntegralPtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+=======
+typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCvtColorPtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, int);
+
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2Ptr)(struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *, int);
 
 typedef void (*__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr)(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize, struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *, int *, int);
@@ -1053,6 +1078,7 @@ static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvMorphologyExPtr __pyx_v_7sci
 static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvSmoothPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSmooth;
 static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFilter2DPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFilter2D;
 static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvIntegralPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvIntegral;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2Ptr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCalibrateCamera2;
 static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners;
 static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCornersPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners;
@@ -1074,16 +1100,49 @@ static PyObject *__pyx_k_60 = 0;
 static PyObject *__pyx_k_61 = 0;
 static int __pyx_k_63;
 static PyObject *__pyx_k_64 = 0;
+=======
+static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCvtColorPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCvtColor;
+static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2Ptr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCalibrateCamera2;
+static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners;
+static __pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCornersPtr __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners;
+static PyObject *__pyx_k_120 = 0;
+static PyObject *__pyx_k_121 = 0;
+static int __pyx_k_122;
+static int __pyx_k_124;
+static PyObject *__pyx_k_125 = 0;
+static int __pyx_k_126;
+static PyObject *__pyx_k_127 = 0;
+static int __pyx_k_128;
+static PyObject *__pyx_k_129 = 0;
+static PyObject *__pyx_k_130 = 0;
+static PyObject *__pyx_k_131 = 0;
+static int __pyx_k_132;
+static PyObject *__pyx_k_133 = 0;
+static PyObject *__pyx_k_134 = 0;
+static PyObject *__pyx_k_135 = 0;
+static PyObject *__pyx_k_136 = 0;
+static int __pyx_k_138;
+static PyObject *__pyx_k_139 = 0;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 #define __Pyx_MODULE_NAME "scikits.image.opencv.opencv_cv"
 int __pyx_module_is_main_scikits__image__opencv__opencv_cv = 0;
 
 /* Implementation of scikits.image.opencv.opencv_cv */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 static PyObject *__pyx_int_neg_1;
 static PyObject *__pyx_int_1;
 static PyObject *__pyx_int_6;
 static PyObject *__pyx_int_3;
 static PyObject *__pyx_int_4;
 static PyObject *__pyx_int_2;
+=======
+static PyObject *__pyx_int_3;
+static PyObject *__pyx_int_4;
+static PyObject *__pyx_int_1;
+static PyObject *__pyx_int_2;
+static PyObject *__pyx_int_neg_1;
+static PyObject *__pyx_int_6;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 static char __pyx_k___main__[] = "__main__";
 static PyObject *__pyx_kp___main__;
 static char __pyx_k_src[] = "src";
@@ -1170,6 +1229,11 @@ static char __pyx_k_square_sum[] = "square_sum";
 static PyObject *__pyx_kp_square_sum;
 static char __pyx_k_tilted_sum[] = "tilted_sum";
 static PyObject *__pyx_kp_tilted_sum;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+=======
+static char __pyx_k_code[] = "code";
+static PyObject *__pyx_kp_code;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_object_points[] = "object_points";
 static PyObject *__pyx_kp_object_points;
 static char __pyx_k_image_points[] = "image_points";
@@ -1198,6 +1262,161 @@ static char __pyx_k__libimport[] = "_libimport";
 static PyObject *__pyx_kp__libimport;
 static char __pyx_k_cv[] = "cv";
 static PyObject *__pyx_kp_cv;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+=======
+static char __pyx_k_38[] = "CV_BGR2BGRA";
+static PyObject *__pyx_kp_38;
+static char __pyx_k_39[] = "UINT8";
+static PyObject *__pyx_kp_39;
+static char __pyx_k_40[] = "UINT16";
+static PyObject *__pyx_kp_40;
+static char __pyx_k_41[] = "FLOAT32";
+static PyObject *__pyx_kp_41;
+static char __pyx_k_42[] = "CV_RGB2RGBA";
+static PyObject *__pyx_kp_42;
+static char __pyx_k_43[] = "CV_BGRA2BGR";
+static PyObject *__pyx_kp_43;
+static char __pyx_k_44[] = "CV_RGBA2RGB";
+static PyObject *__pyx_kp_44;
+static char __pyx_k_45[] = "CV_BGR2RGBA";
+static PyObject *__pyx_kp_45;
+static char __pyx_k_46[] = "CV_RGB2BGRA";
+static PyObject *__pyx_kp_46;
+static char __pyx_k_47[] = "CV_RGBA2BGR";
+static PyObject *__pyx_kp_47;
+static char __pyx_k_48[] = "CV_BGRA2RGB";
+static PyObject *__pyx_kp_48;
+static char __pyx_k_49[] = "CV_BGR2RGB";
+static PyObject *__pyx_kp_49;
+static char __pyx_k_50[] = "CV_RGB2BGR";
+static PyObject *__pyx_kp_50;
+static char __pyx_k_51[] = "CV_BGRA2RGBA";
+static PyObject *__pyx_kp_51;
+static char __pyx_k_52[] = "CV_RGBA2BGRA";
+static PyObject *__pyx_kp_52;
+static char __pyx_k_53[] = "CV_BGR2GRAY";
+static PyObject *__pyx_kp_53;
+static char __pyx_k_54[] = "CV_RGB2GRAY";
+static PyObject *__pyx_kp_54;
+static char __pyx_k_55[] = "CV_GRAY2BGR";
+static PyObject *__pyx_kp_55;
+static char __pyx_k_56[] = "CV_GRAY2RGB";
+static PyObject *__pyx_kp_56;
+static char __pyx_k_57[] = "CV_GRAY2BGRA";
+static PyObject *__pyx_kp_57;
+static char __pyx_k_58[] = "CV_GRAY2RGBA";
+static PyObject *__pyx_kp_58;
+static char __pyx_k_59[] = "CV_BGRA2GRAY";
+static PyObject *__pyx_kp_59;
+static char __pyx_k_60[] = "CV_RGBA2GRAY";
+static PyObject *__pyx_kp_60;
+static char __pyx_k_61[] = "CV_BGR2BGR565";
+static PyObject *__pyx_kp_61;
+static char __pyx_k_62[] = "CV_RGB2BGR565";
+static PyObject *__pyx_kp_62;
+static char __pyx_k_63[] = "CV_BGR5652BGR";
+static PyObject *__pyx_kp_63;
+static char __pyx_k_64[] = "CV_BGR5652RGB";
+static PyObject *__pyx_kp_64;
+static char __pyx_k_65[] = "CV_BGRA2BGR565";
+static PyObject *__pyx_kp_65;
+static char __pyx_k_66[] = "CV_RGBA2BGR565";
+static PyObject *__pyx_kp_66;
+static char __pyx_k_67[] = "CV_BGR5652BGRA";
+static PyObject *__pyx_kp_67;
+static char __pyx_k_68[] = "CV_BGR5652RGBA";
+static PyObject *__pyx_kp_68;
+static char __pyx_k_69[] = "CV_GRAY2BGR565";
+static PyObject *__pyx_kp_69;
+static char __pyx_k_70[] = "CV_BGR5652GRAY";
+static PyObject *__pyx_kp_70;
+static char __pyx_k_71[] = "CV_BGR2BGR555";
+static PyObject *__pyx_kp_71;
+static char __pyx_k_72[] = "CV_RGB2BGR555";
+static PyObject *__pyx_kp_72;
+static char __pyx_k_73[] = "CV_BGR5552BGR";
+static PyObject *__pyx_kp_73;
+static char __pyx_k_74[] = "CV_BGR5552RGB";
+static PyObject *__pyx_kp_74;
+static char __pyx_k_75[] = "CV_BGRA2BGR555";
+static PyObject *__pyx_kp_75;
+static char __pyx_k_76[] = "CV_RGBA2BGR555";
+static PyObject *__pyx_kp_76;
+static char __pyx_k_77[] = "CV_BGR5552BGRA";
+static PyObject *__pyx_kp_77;
+static char __pyx_k_78[] = "CV_BGR5552RGBA";
+static PyObject *__pyx_kp_78;
+static char __pyx_k_79[] = "CV_GRAY2BGR555";
+static PyObject *__pyx_kp_79;
+static char __pyx_k_80[] = "CV_BGR5552GRAY";
+static PyObject *__pyx_kp_80;
+static char __pyx_k_81[] = "CV_BGR2XYZ";
+static PyObject *__pyx_kp_81;
+static char __pyx_k_82[] = "CV_RGB2XYZ";
+static PyObject *__pyx_kp_82;
+static char __pyx_k_83[] = "CV_XYZ2BGR";
+static PyObject *__pyx_kp_83;
+static char __pyx_k_84[] = "CV_XYZ2RGB";
+static PyObject *__pyx_kp_84;
+static char __pyx_k_85[] = "CV_BGR2YCrCb";
+static PyObject *__pyx_kp_85;
+static char __pyx_k_86[] = "CV_RGB2YCrCb";
+static PyObject *__pyx_kp_86;
+static char __pyx_k_87[] = "CV_YCrCb2BGR";
+static PyObject *__pyx_kp_87;
+static char __pyx_k_88[] = "CV_YCrCb2RGB";
+static PyObject *__pyx_kp_88;
+static char __pyx_k_89[] = "CV_BGR2HSV";
+static PyObject *__pyx_kp_89;
+static char __pyx_k_90[] = "CV_RGB2HSV";
+static PyObject *__pyx_kp_90;
+static char __pyx_k_91[] = "CV_BGR2Lab";
+static PyObject *__pyx_kp_91;
+static char __pyx_k_92[] = "CV_RGB2Lab";
+static PyObject *__pyx_kp_92;
+static char __pyx_k_93[] = "CV_BayerBG2BGR";
+static PyObject *__pyx_kp_93;
+static char __pyx_k_94[] = "CV_BayerGB2BGR";
+static PyObject *__pyx_kp_94;
+static char __pyx_k_95[] = "CV_BayerRG2BGR";
+static PyObject *__pyx_kp_95;
+static char __pyx_k_96[] = "CV_BayerGR2BGR";
+static PyObject *__pyx_kp_96;
+static char __pyx_k_97[] = "CV_BayerBG2RGB";
+static PyObject *__pyx_kp_97;
+static char __pyx_k_98[] = "CV_BayerGB2RGB";
+static PyObject *__pyx_kp_98;
+static char __pyx_k_99[] = "CV_BayerRG2RGB";
+static PyObject *__pyx_kp_99;
+static char __pyx_k_100[] = "CV_BayerGR2RGB";
+static PyObject *__pyx_kp_100;
+static char __pyx_k_101[] = "CV_BGR2Luv";
+static PyObject *__pyx_kp_101;
+static char __pyx_k_102[] = "CV_RGB2Luv";
+static PyObject *__pyx_kp_102;
+static char __pyx_k_103[] = "CV_BGR2HLS";
+static PyObject *__pyx_kp_103;
+static char __pyx_k_104[] = "CV_RGB2HLS";
+static PyObject *__pyx_kp_104;
+static char __pyx_k_105[] = "CV_HSV2BGR";
+static PyObject *__pyx_kp_105;
+static char __pyx_k_106[] = "CV_HSV2RGB";
+static PyObject *__pyx_kp_106;
+static char __pyx_k_107[] = "CV_Lab2BGR";
+static PyObject *__pyx_kp_107;
+static char __pyx_k_108[] = "CV_Lab2RGB";
+static PyObject *__pyx_kp_108;
+static char __pyx_k_109[] = "CV_Luv2BGR";
+static PyObject *__pyx_kp_109;
+static char __pyx_k_110[] = "CV_Luv2RGB";
+static PyObject *__pyx_kp_110;
+static char __pyx_k_111[] = "CV_HLS2BGR";
+static PyObject *__pyx_kp_111;
+static char __pyx_k_112[] = "CV_HLS2RGB";
+static PyObject *__pyx_kp_112;
+static char __pyx_k__cvtcolor_dict[] = "_cvtcolor_dict";
+static PyObject *__pyx_kp__cvtcolor_dict;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_addressof[] = "addressof";
 static PyObject *__pyx_kp_addressof;
 static char __pyx_k_cvSobel[] = "cvSobel";
@@ -1208,20 +1427,34 @@ static char __pyx_k_cvCanny[] = "cvCanny";
 static PyObject *__pyx_kp_cvCanny;
 static char __pyx_k_cvPreCornerDetect[] = "cvPreCornerDetect";
 static PyObject *__pyx_kp_cvPreCornerDetect;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_38[] = "cvCornerEigenValsAndVecs";
 static PyObject *__pyx_kp_38;
+=======
+static char __pyx_k_113[] = "cvCornerEigenValsAndVecs";
+static PyObject *__pyx_kp_113;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_cvCornerMinEigenVal[] = "cvCornerMinEigenVal";
 static PyObject *__pyx_kp_cvCornerMinEigenVal;
 static char __pyx_k_cvCornerHarris[] = "cvCornerHarris";
 static PyObject *__pyx_kp_cvCornerHarris;
 static char __pyx_k_cvFindCornerSubPix[] = "cvFindCornerSubPix";
 static PyObject *__pyx_kp_cvFindCornerSubPix;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_39[] = "cvGoodFeaturesToTrack";
 static PyObject *__pyx_kp_39;
 static char __pyx_k_cvGetRectSubPix[] = "cvGetRectSubPix";
 static PyObject *__pyx_kp_cvGetRectSubPix;
 static char __pyx_k_40[] = "cvGetQuadrangleSubPix";
 static PyObject *__pyx_kp_40;
+=======
+static char __pyx_k_114[] = "cvGoodFeaturesToTrack";
+static PyObject *__pyx_kp_114;
+static char __pyx_k_cvGetRectSubPix[] = "cvGetRectSubPix";
+static PyObject *__pyx_kp_cvGetRectSubPix;
+static char __pyx_k_115[] = "cvGetQuadrangleSubPix";
+static PyObject *__pyx_kp_115;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_cvResize[] = "cvResize";
 static PyObject *__pyx_kp_cvResize;
 static char __pyx_k_cvWarpAffine[] = "cvWarpAffine";
@@ -1238,6 +1471,7 @@ static char __pyx_k_cvMorphologyEx[] = "cvMorphologyEx";
 static PyObject *__pyx_kp_cvMorphologyEx;
 static char __pyx_k_cvSmooth[] = "cvSmooth";
 static PyObject *__pyx_kp_cvSmooth;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_41[] = "cvFilter2D";
 static PyObject *__pyx_kp_41;
 static char __pyx_k_cvIntegral[] = "cvIntegral";
@@ -1262,12 +1496,41 @@ static char __pyx_k_66[] = "INT8";
 static PyObject *__pyx_kp_66;
 static char __pyx_k_67[] = "FLOAT32";
 static PyObject *__pyx_kp_67;
+=======
+static char __pyx_k_116[] = "cvFilter2D";
+static PyObject *__pyx_kp_116;
+static char __pyx_k_cvIntegral[] = "cvIntegral";
+static PyObject *__pyx_kp_cvIntegral;
+static char __pyx_k_cvCvtColor[] = "cvCvtColor";
+static PyObject *__pyx_kp_cvCvtColor;
+static char __pyx_k_117[] = "cvCalibrateCamera2";
+static PyObject *__pyx_kp_117;
+static char __pyx_k_118[] = "cvFindChessboardCorners";
+static PyObject *__pyx_kp_118;
+static char __pyx_k_119[] = "cvDrawChessboardCorners";
+static PyObject *__pyx_kp_119;
+static char __pyx_k_CV_INTER_LINEAR[] = "CV_INTER_LINEAR";
+static PyObject *__pyx_kp_CV_INTER_LINEAR;
+static char __pyx_k_123[] = "CV_WARP_FILL_OUTLIERS";
+static PyObject *__pyx_kp_123;
+static char __pyx_k_CV_GAUSSIAN[] = "CV_GAUSSIAN";
+static PyObject *__pyx_kp_CV_GAUSSIAN;
+static char __pyx_k_137[] = "CV_CALIB_CB_ADAPTIVE_THRESH";
+static PyObject *__pyx_kp_137;
+static char __pyx_k_140[] = "INT8";
+static PyObject *__pyx_kp_140;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_ValueError[] = "ValueError";
 static PyObject *__pyx_kp_ValueError;
 static char __pyx_k_dtype[] = "dtype";
 static PyObject *__pyx_kp_dtype;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_69[] = "INT16";
 static PyObject *__pyx_kp_69;
+=======
+static char __pyx_k_142[] = "INT16";
+static PyObject *__pyx_kp_142;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_reshape[] = "reshape";
 static PyObject *__pyx_kp_reshape;
 static char __pyx_k_shape[] = "shape";
@@ -1290,17 +1553,29 @@ static char __pyx_k_CV_BLUR_NO_SCALE[] = "CV_BLUR_NO_SCALE";
 static PyObject *__pyx_kp_CV_BLUR_NO_SCALE;
 static char __pyx_k_CV_BLUR[] = "CV_BLUR";
 static PyObject *__pyx_kp_CV_BLUR;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_91[] = "FLOAT64";
 static PyObject *__pyx_kp_91;
 static char __pyx_k_92[] = "INT32";
 static PyObject *__pyx_kp_92;
 static char __pyx_k_append[] = "append";
 static PyObject *__pyx_kp_append;
+=======
+static char __pyx_k_164[] = "FLOAT64";
+static PyObject *__pyx_kp_164;
+static char __pyx_k_165[] = "INT32";
+static PyObject *__pyx_kp_165;
+static char __pyx_k_append[] = "append";
+static PyObject *__pyx_kp_append;
+static char __pyx_k_KeyError[] = "KeyError";
+static PyObject *__pyx_kp_KeyError;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 static char __pyx_k_copy[] = "copy";
 static PyObject *__pyx_kp_copy;
 static PyObject *__pyx_builtin_ValueError;
 static PyObject *__pyx_builtin_range;
 static PyObject *__pyx_builtin_RuntimeError;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 static PyObject *__pyx_kp_68;
 static char __pyx_k_68[] = "aperture_size must be 3, 5, or 7";
 static PyObject *__pyx_kp_70;
@@ -1345,6 +1620,55 @@ static PyObject *__pyx_kp_89;
 static PyObject *__pyx_kp_90;
 static char __pyx_k_89[] = "anchor must be (x, y) tuple";
 static char __pyx_k_90[] = "anchor point must be inside kernel";
+=======
+static PyObject *__pyx_builtin_KeyError;
+static PyObject *__pyx_kp_141;
+static char __pyx_k_141[] = "aperture_size must be 3, 5, or 7";
+static PyObject *__pyx_kp_143;
+static char __pyx_k_143[] = "aperture_size must be 3, 5, or 7";
+static PyObject *__pyx_kp_144;
+static char __pyx_k_144[] = "aperture_size must be 3, 5, or 7";
+static PyObject *__pyx_kp_145;
+static char __pyx_k_145[] = "aperture_size must be 3, 5, or 7";
+static PyObject *__pyx_kp_146;
+static char __pyx_k_146[] = "aperture_size must be 3, 5, or 7";
+static PyObject *__pyx_kp_147;
+static char __pyx_k_147[] = "aperture_size must be 3, 5, or 7";
+static PyObject *__pyx_kp_148;
+static char __pyx_k_148[] = "aperture_size must be 3, 5, or 7";
+static PyObject *__pyx_kp_149;
+static char __pyx_k_149[] = "The number of declared points is different than exists in the array.";
+static PyObject *__pyx_kp_150;
+static PyObject *__pyx_kp_151;
+static char __pyx_k_150[] = "warpmat must be 2x3";
+static char __pyx_k_151[] = "warpmat must be 2x3";
+static PyObject *__pyx_kp_152;
+static char __pyx_k_152[] = "width and height must not be none";
+static PyObject *__pyx_kp_153;
+static PyObject *__pyx_kp_154;
+static PyObject *__pyx_kp_155;
+static char __pyx_k_153[] = "fillval must be a 4-tuple";
+static char __pyx_k_154[] = "warpmat must be 2x3";
+static char __pyx_k_155[] = "warpmat must be 2x3";
+static PyObject *__pyx_kp_156;
+static PyObject *__pyx_kp_157;
+static PyObject *__pyx_kp_158;
+static char __pyx_k_156[] = "fillval must be a 4-tuple";
+static char __pyx_k_157[] = "warpmat must be 3x3";
+static char __pyx_k_158[] = "warpmat must be 3x3";
+static PyObject *__pyx_kp_159;
+static char __pyx_k_159[] = "operation type not understood";
+static PyObject *__pyx_kp_160;
+static PyObject *__pyx_kp_161;
+static char __pyx_k_160[] = "In place operation not supported with this filter";
+static char __pyx_k_161[] = "In place operation not supported with this filter";
+static PyObject *__pyx_kp_162;
+static PyObject *__pyx_kp_163;
+static char __pyx_k_162[] = "anchor must be (x, y) tuple";
+static char __pyx_k_163[] = "anchor point must be inside kernel";
+static PyObject *__pyx_kp_166;
+static char __pyx_k_166[] = "unknown conversion code";
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 static PyObject *__pyx_int_15;
 static char __pyx_k___getbuffer__[] = "__getbuffer__";
 static PyObject *__pyx_kp___getbuffer__;
@@ -1391,7 +1715,11 @@ static char __pyx_k_28[] = "Non-native byte order not supported";
 static char __pyx_k_29[] = "Format string allocated too short.";
 static char __pyx_k_30[] = "unknown dtype code in numpy.pxd (%d)";
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":170
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":260
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * # Function Implementations
  * ####################################
  * def cvSobel(np.ndarray src, np.ndarray out=None, int xorder=1, int yorder=0,             # <<<<<<<<<<<<<<
@@ -1462,22 +1790,38 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvSobel") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvSobel") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     __pyx_v_out = ((PyArrayObject *)values[1]);
     if (values[2]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_xorder = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_xorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_xorder = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_xorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_xorder = 1;
     }
     if (values[3]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_yorder = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_yorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_yorder = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_yorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_yorder = 0;
     }
     if (values[4]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_aperture_size = 3;
     }
@@ -1487,9 +1831,15 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
     __pyx_v_yorder = 0;
     __pyx_v_aperture_size = 3;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       case  5: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  4: __pyx_v_yorder = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_yorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  3: __pyx_v_xorder = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_xorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      case  5: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  4: __pyx_v_yorder = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_yorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  3: __pyx_v_xorder = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_xorder == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  2: __pyx_v_out = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
       case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
       break;
@@ -1498,31 +1848,49 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvSobel", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+  __Pyx_RaiseArgtupleInvalid("cvSobel", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvSobel");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __Pyx_INCREF((PyObject *)__pyx_v_out);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":179
+=======
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 260; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":269
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     """
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     assert_dtype(src, [UINT8, INT8, FLOAT32])
  *     assert_nchannels(src, [1])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 179; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":180
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 269; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":270
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)
  *     assert_dtype(src, [UINT8, INT8, FLOAT32])             # <<<<<<<<<<<<<<
  *     assert_nchannels(src, [1])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_66); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1530,6 +1898,15 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_3);
   __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_140); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
@@ -1540,25 +1917,43 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
   __pyx_1 = 0;
   __pyx_2 = 0;
   __pyx_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 180; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":181
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":271
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     validate_array(src)
  *     assert_dtype(src, [UINT8, INT8, FLOAT32])
  *     assert_nchannels(src, [1])             # <<<<<<<<<<<<<<
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 271; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 181; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":183
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 271; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":273
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     assert_nchannels(src, [1])
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):             # <<<<<<<<<<<<<<
@@ -1577,29 +1972,50 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
   }
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":184
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":274
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  *         raise ValueError('aperture_size must be 3, 5, or 7')             # <<<<<<<<<<<<<<
  * 
  *     if out is not None:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_68);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_68);
     __Pyx_GIVEREF(__pyx_kp_68);
     __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_141);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_141);
+    __Pyx_GIVEREF(__pyx_kp_141);
+    __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_5, 0, 0);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     goto __pyx_L6;
   }
   __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":186
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":276
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         raise ValueError('aperture_size must be 3, 5, or 7')
  * 
  *     if out is not None:             # <<<<<<<<<<<<<<
@@ -1609,55 +2025,89 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
   __pyx_t_4 = (((PyObject *)__pyx_v_out) != Py_None);
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":187
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":277
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if out is not None:
  *         validate_array(out)             # <<<<<<<<<<<<<<
  *         assert_not_sharing_data(src, out)
  *         assert_same_shape(src, out)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 187; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":188
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 277; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":278
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     if out is not None:
  *         validate_array(out)
  *         assert_not_sharing_data(src, out)             # <<<<<<<<<<<<<<
  *         assert_same_shape(src, out)
  *         assert_nchannels(out, [1])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 188; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":189
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 278; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":279
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         validate_array(out)
  *         assert_not_sharing_data(src, out)
  *         assert_same_shape(src, out)             # <<<<<<<<<<<<<<
  *         assert_nchannels(out, [1])
  *         if src.dtype == UINT8 or src.dtype == INT8:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":190
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 279; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":280
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         assert_not_sharing_data(src, out)
  *         assert_same_shape(src, out)
  *         assert_nchannels(out, [1])             # <<<<<<<<<<<<<<
  *         if src.dtype == UINT8 or src.dtype == INT8:
  *             assert_dtype(out, [INT16])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(((PyObject *)__pyx_t_5));
     __Pyx_INCREF(__pyx_int_1);
     PyList_SET_ITEM(__pyx_t_5, 0, __pyx_int_1);
     __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 190; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":191
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 280; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":281
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         assert_same_shape(src, out)
  *         assert_nchannels(out, [1])
  *         if src.dtype == UINT8 or src.dtype == INT8:             # <<<<<<<<<<<<<<
  *             assert_dtype(out, [INT16])
  *         else:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
     __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1678,6 +2128,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
       __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 281; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_5);
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 281; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 281; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 281; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+    if (!__pyx_t_4) {
+      __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 281; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_2);
+      __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_140); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 281; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_2);
+      __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 281; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_5);
+      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+      __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+      __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 281; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       __pyx_t_6 = __pyx_t_3;
     } else {
@@ -1685,41 +2157,69 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
     }
     if (__pyx_t_6) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":192
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":282
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         assert_nchannels(out, [1])
  *         if src.dtype == UINT8 or src.dtype == INT8:
  *             assert_dtype(out, [INT16])             # <<<<<<<<<<<<<<
  *         else:
  *             assert_dtype(out, [FLOAT32])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_69); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_3);
       __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_142); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 282; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_3);
+      __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 282; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_GOTREF(((PyObject *)__pyx_t_5));
       PyList_SET_ITEM(__pyx_t_5, 0, __pyx_3);
       __Pyx_GIVEREF(__pyx_3);
       __pyx_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 192; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 282; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
       goto __pyx_L8;
     }
     /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":194
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":284
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *             assert_dtype(out, [INT16])
  *         else:
  *             assert_dtype(out, [FLOAT32])             # <<<<<<<<<<<<<<
  *     else:
  *         if src.dtype == UINT8 or src.dtype == INT8:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_1);
       __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 284; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_1);
+      __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 284; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_GOTREF(((PyObject *)__pyx_t_5));
       PyList_SET_ITEM(__pyx_t_5, 0, __pyx_1);
       __Pyx_GIVEREF(__pyx_1);
       __pyx_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 194; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 284; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
     }
     __pyx_L8:;
@@ -1727,13 +2227,18 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":196
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":286
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *             assert_dtype(out, [FLOAT32])
  *     else:
  *         if src.dtype == UINT8 or src.dtype == INT8:             # <<<<<<<<<<<<<<
  *             out = new_array_like_diff_dtype(src, INT16)
  *         else:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1754,6 +2259,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
       __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_5);
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_2);
+    __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+    __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+    if (!__pyx_t_6) {
+      __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_2);
+      __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_140); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_3);
+      __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_5);
+      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+      __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+      __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       __pyx_t_3 = __pyx_t_4;
     } else {
@@ -1761,16 +2288,26 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
     }
     if (__pyx_t_3) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":197
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":287
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     else:
  *         if src.dtype == UINT8 or src.dtype == INT8:
  *             out = new_array_like_diff_dtype(src, INT16)             # <<<<<<<<<<<<<<
  *         else:
  *             out = new_array_like(src)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_69); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_1);
       __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 197; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_142); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_1);
+      __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 287; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_GOTREF(__pyx_t_5);
       __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
       __Pyx_DECREF(((PyObject *)__pyx_v_out));
@@ -1780,14 +2317,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
     }
     /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":199
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":289
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *             out = new_array_like_diff_dtype(src, INT16)
  *         else:
  *             out = new_array_like(src)             # <<<<<<<<<<<<<<
  * 
  *     cdef IplImage srcimg
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 199; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 289; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_GOTREF(__pyx_t_5);
       __Pyx_DECREF(((PyObject *)__pyx_v_out));
       __pyx_v_out = ((PyArrayObject *)__pyx_t_5);
@@ -1797,7 +2342,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
   }
   __pyx_L7:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":204
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":294
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage outimg
  * 
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
@@ -1806,7 +2355,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":205
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":295
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     populate_iplimage(src, &srcimg)
  *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
@@ -1815,7 +2368,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":207
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":297
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(out, &outimg)
  * 
  *     c_cvSobel(&srcimg, &outimg, xorder, yorder, aperture_size)             # <<<<<<<<<<<<<<
@@ -1824,7 +2381,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
  */
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSobel((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_xorder, __pyx_v_yorder, __pyx_v_aperture_size);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":209
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":299
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     c_cvSobel(&srcimg, &outimg, xorder, yorder, aperture_size)
  * 
  *     return out             # <<<<<<<<<<<<<<
@@ -1853,7 +2414,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel(PyObject *_
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":211
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":301
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     return out
  * 
  * def cvLaplace(np.ndarray src, np.ndarray out=None, int aperture_size=3):             # <<<<<<<<<<<<<<
@@ -1910,12 +2475,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvLaplace") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvLaplace") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     __pyx_v_out = ((PyArrayObject *)values[1]);
     if (values[2]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_aperture_size = 3;
     }
@@ -1923,7 +2496,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
     __pyx_v_out = ((PyArrayObject *)Py_None);
     __pyx_v_aperture_size = 3;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       case  3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      case  3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  2: __pyx_v_out = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
       case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
       break;
@@ -1932,31 +2509,49 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvLaplace", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+  __Pyx_RaiseArgtupleInvalid("cvLaplace", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvLaplace");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __Pyx_INCREF((PyObject *)__pyx_v_out);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":219
+=======
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":309
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     """
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     assert_dtype(src, [UINT8, INT8, FLOAT32])
  *     assert_nchannels(src, [1])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":220
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 309; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":310
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)
  *     assert_dtype(src, [UINT8, INT8, FLOAT32])             # <<<<<<<<<<<<<<
  *     assert_nchannels(src, [1])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_66); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -1964,6 +2559,15 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
   __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_3);
   __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_140); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
@@ -1974,25 +2578,43 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
   __pyx_1 = 0;
   __pyx_2 = 0;
   __pyx_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 220; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":221
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 310; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":311
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     validate_array(src)
  *     assert_dtype(src, [UINT8, INT8, FLOAT32])
  *     assert_nchannels(src, [1])             # <<<<<<<<<<<<<<
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 221; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":223
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 311; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":313
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     assert_nchannels(src, [1])
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):             # <<<<<<<<<<<<<<
@@ -2011,29 +2633,50 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
   }
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":224
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":314
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  *         raise ValueError('aperture_size must be 3, 5, or 7')             # <<<<<<<<<<<<<<
  * 
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_70);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_70);
     __Pyx_GIVEREF(__pyx_kp_70);
     __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_143);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_143);
+    __Pyx_GIVEREF(__pyx_kp_143);
+    __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_5, 0, 0);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 314; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     goto __pyx_L6;
   }
   __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":227
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":317
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * 
  *     if out is not None:             # <<<<<<<<<<<<<<
@@ -2043,55 +2686,89 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
   __pyx_t_4 = (((PyObject *)__pyx_v_out) != Py_None);
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":228
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":318
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if out is not None:
  *         validate_array(out)             # <<<<<<<<<<<<<<
  *         assert_not_sharing_data(src, out)
  *         assert_same_shape(src, out)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":229
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":319
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     if out is not None:
  *         validate_array(out)
  *         assert_not_sharing_data(src, out)             # <<<<<<<<<<<<<<
  *         assert_same_shape(src, out)
  *         assert_nchannels(out, [1])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":230
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 319; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":320
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         validate_array(out)
  *         assert_not_sharing_data(src, out)
  *         assert_same_shape(src, out)             # <<<<<<<<<<<<<<
  *         assert_nchannels(out, [1])
  *         if src.dtype == UINT8 or src.dtype == INT8:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":231
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 320; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":321
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         assert_not_sharing_data(src, out)
  *         assert_same_shape(src, out)
  *         assert_nchannels(out, [1])             # <<<<<<<<<<<<<<
  *         if src.dtype == UINT8 or src.dtype == INT8:
  *             assert_dtype(out, [INT16])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 321; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(((PyObject *)__pyx_t_5));
     __Pyx_INCREF(__pyx_int_1);
     PyList_SET_ITEM(__pyx_t_5, 0, __pyx_int_1);
     __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 231; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":232
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 321; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":322
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         assert_same_shape(src, out)
  *         assert_nchannels(out, [1])
  *         if src.dtype == UINT8 or src.dtype == INT8:             # <<<<<<<<<<<<<<
  *             assert_dtype(out, [INT16])
  *         else:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
     __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -2112,6 +2789,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
       __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 232; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_5);
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+    if (!__pyx_t_4) {
+      __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_2);
+      __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_140); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_2);
+      __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_5);
+      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+      __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+      __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 322; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       __pyx_t_6 = __pyx_t_3;
     } else {
@@ -2119,41 +2818,69 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
     }
     if (__pyx_t_6) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":233
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":323
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         assert_nchannels(out, [1])
  *         if src.dtype == UINT8 or src.dtype == INT8:
  *             assert_dtype(out, [INT16])             # <<<<<<<<<<<<<<
  *         else:
  *             assert_dtype(out, [FLOAT32])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_69); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_3);
       __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_142); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 323; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_3);
+      __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 323; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_GOTREF(((PyObject *)__pyx_t_5));
       PyList_SET_ITEM(__pyx_t_5, 0, __pyx_3);
       __Pyx_GIVEREF(__pyx_3);
       __pyx_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 323; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
       goto __pyx_L8;
     }
     /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":235
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":325
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *             assert_dtype(out, [INT16])
  *         else:
  *             assert_dtype(out, [FLOAT32])             # <<<<<<<<<<<<<<
  *     else:
  *         if src.dtype == UINT8 or src.dtype == INT8:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_1);
       __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_1);
+      __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_GOTREF(((PyObject *)__pyx_t_5));
       PyList_SET_ITEM(__pyx_t_5, 0, __pyx_1);
       __Pyx_GIVEREF(__pyx_1);
       __pyx_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 235; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 325; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
     }
     __pyx_L8:;
@@ -2161,13 +2888,18 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":237
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":327
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *             assert_dtype(out, [FLOAT32])
  *     else:
  *         if src.dtype == UINT8 or src.dtype == INT8:             # <<<<<<<<<<<<<<
  *             out = new_array_like_diff_dtype(src, INT16)
  *         else:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -2188,6 +2920,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
       __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
       __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
       __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 237; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_5 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_5);
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_2);
+    __pyx_t_2 = PyObject_RichCompare(__pyx_t_5, __pyx_2, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+    __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+    if (!__pyx_t_6) {
+      __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_2);
+      __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_140); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_3);
+      __pyx_t_5 = PyObject_RichCompare(__pyx_t_2, __pyx_3, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_5);
+      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+      __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+      __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 327; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
       __pyx_t_3 = __pyx_t_4;
     } else {
@@ -2195,16 +2949,26 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
     }
     if (__pyx_t_3) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":238
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":328
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     else:
  *         if src.dtype == UINT8 or src.dtype == INT8:
  *             out = new_array_like_diff_dtype(src, INT16)             # <<<<<<<<<<<<<<
  *         else:
  *             out = new_array_like(src)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_69); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 238; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_1);
       __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 238; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_142); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_1);
+      __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 328; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_GOTREF(__pyx_t_5);
       __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
       __Pyx_DECREF(((PyObject *)__pyx_v_out));
@@ -2214,14 +2978,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
     }
     /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":240
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":330
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *             out = new_array_like_diff_dtype(src, INT16)
  *         else:
  *             out = new_array_like(src)             # <<<<<<<<<<<<<<
  * 
  *     cdef IplImage srcimg
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 240; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __Pyx_GOTREF(__pyx_t_5);
       __Pyx_DECREF(((PyObject *)__pyx_v_out));
       __pyx_v_out = ((PyArrayObject *)__pyx_t_5);
@@ -2231,7 +3003,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
   }
   __pyx_L7:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":245
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":335
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage outimg
  * 
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
@@ -2240,7 +3016,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":246
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":336
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     populate_iplimage(src, &srcimg)
  *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
@@ -2249,7 +3029,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":248
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":338
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(out, &outimg)
  * 
  *     c_cvLaplace(&srcimg, &outimg, aperture_size)             # <<<<<<<<<<<<<<
@@ -2258,7 +3042,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
  */
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvLaplace((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_aperture_size);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":250
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":340
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     c_cvLaplace(&srcimg, &outimg, aperture_size)
  * 
  *     return out             # <<<<<<<<<<<<<<
@@ -2287,7 +3075,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace(PyObject
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":252
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":342
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     return out
  * 
  * def cvCanny(np.ndarray src, np.ndarray out=None, double threshold1=10,             # <<<<<<<<<<<<<<
@@ -2354,22 +3146,38 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCanny") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCanny") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     __pyx_v_out = ((PyArrayObject *)values[1]);
     if (values[2]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_threshold1 = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_threshold1 = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_threshold1 = ((double)10);
     }
     if (values[3]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_threshold2 = __pyx_PyFloat_AsDouble(values[3]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_threshold2 = __pyx_PyFloat_AsDouble(values[3]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 343; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_threshold2 = ((double)50);
     }
     if (values[4]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 343; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_aperture_size = 3;
     }
@@ -2379,9 +3187,15 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_
     __pyx_v_threshold2 = ((double)50);
     __pyx_v_aperture_size = 3;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       case  5: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  4: __pyx_v_threshold2 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  3: __pyx_v_threshold1 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      case  5: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 343; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  4: __pyx_v_threshold2 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 343; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  3: __pyx_v_threshold1 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  2: __pyx_v_out = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
       case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
       break;
@@ -2390,40 +3204,68 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvCanny", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+  __Pyx_RaiseArgtupleInvalid("cvCanny", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCanny");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __Pyx_INCREF((PyObject *)__pyx_v_out);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 252; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":261
+=======
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 342; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":351
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     """
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     assert_nchannels(src, [1])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 261; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":262
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 351; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":352
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)
  *     assert_nchannels(src, [1])             # <<<<<<<<<<<<<<
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 262; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":264
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":354
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     assert_nchannels(src, [1])
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):             # <<<<<<<<<<<<<<
@@ -2442,29 +3284,50 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_
   }
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":265
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":355
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  *         raise ValueError('aperture_size must be 3, 5, or 7')             # <<<<<<<<<<<<<<
  * 
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_71);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_71);
     __Pyx_GIVEREF(__pyx_kp_71);
     __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_144);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_144);
+    __Pyx_GIVEREF(__pyx_kp_144);
+    __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_5, 0, 0);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 265; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 355; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     goto __pyx_L6;
   }
   __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":268
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":358
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * 
  *     if out is not None:             # <<<<<<<<<<<<<<
@@ -2474,59 +3337,98 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_
   __pyx_t_4 = (((PyObject *)__pyx_v_out) != Py_None);
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":269
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":359
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if out is not None:
  *         validate_array(out)             # <<<<<<<<<<<<<<
  *         assert_nchannels(out, [1])
  *         assert_same_shape(src, out)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 269; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":270
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 359; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":360
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     if out is not None:
  *         validate_array(out)
  *         assert_nchannels(out, [1])             # <<<<<<<<<<<<<<
  *         assert_same_shape(src, out)
  *         assert_not_sharing_data(src, out)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(((PyObject *)__pyx_t_5));
     __Pyx_INCREF(__pyx_int_1);
     PyList_SET_ITEM(__pyx_t_5, 0, __pyx_int_1);
     __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 270; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":271
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 360; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":361
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         validate_array(out)
  *         assert_nchannels(out, [1])
  *         assert_same_shape(src, out)             # <<<<<<<<<<<<<<
  *         assert_not_sharing_data(src, out)
  *     else:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 271; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":272
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 361; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":362
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         assert_nchannels(out, [1])
  *         assert_same_shape(src, out)
  *         assert_not_sharing_data(src, out)             # <<<<<<<<<<<<<<
  *     else:
  *         out = new_array_like(src)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 272; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 362; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     goto __pyx_L7;
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":274
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":364
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         assert_not_sharing_data(src, out)
  *     else:
  *         out = new_array_like(src)             # <<<<<<<<<<<<<<
  * 
  *     cdef IplImage srcimg
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(((PyObject *)__pyx_v_out));
     __pyx_v_out = ((PyArrayObject *)__pyx_t_5);
@@ -2534,7 +3436,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_
   }
   __pyx_L7:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":278
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":368
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage srcimg
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
@@ -2543,7 +3449,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":279
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":369
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)
  *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
@@ -2552,7 +3462,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":281
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":371
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(out, &outimg)
  * 
  *     c_cvCanny(&srcimg, &outimg, threshold1, threshold2, aperture_size)             # <<<<<<<<<<<<<<
@@ -2561,7 +3475,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_
  */
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCanny((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_threshold1, __pyx_v_threshold2, __pyx_v_aperture_size);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":283
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":373
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     c_cvCanny(&srcimg, &outimg, threshold1, threshold2, aperture_size)
  * 
  *     return out             # <<<<<<<<<<<<<<
@@ -2587,7 +3505,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny(PyObject *_
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":285
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":375
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     return out
  * 
  * def cvPreCornerDetect(np.ndarray src, np.ndarray out=None,             # <<<<<<<<<<<<<<
@@ -2642,12 +3564,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvPreCornerDetect") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvPreCornerDetect") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     __pyx_v_out = ((PyArrayObject *)values[1]);
     if (values[2]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 376; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_aperture_size = 3;
     }
@@ -2655,7 +3585,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P
     __pyx_v_out = ((PyArrayObject *)Py_None);
     __pyx_v_aperture_size = 3;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       case  3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 286; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      case  3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 376; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  2: __pyx_v_out = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
       case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
       break;
@@ -2664,36 +3598,61 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvPreCornerDetect", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+  __Pyx_RaiseArgtupleInvalid("cvPreCornerDetect", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvPreCornerDetect");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __Pyx_INCREF((PyObject *)__pyx_v_out);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":293
+=======
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":383
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     """
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     assert_dtype(src, [UINT8, FLOAT32])
  *     assert_nchannels(src, [1])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 293; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":294
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 383; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":384
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)
  *     assert_dtype(src, [UINT8, FLOAT32])             # <<<<<<<<<<<<<<
  *     assert_nchannels(src, [1])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 384; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 384; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 384; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
@@ -2701,25 +3660,43 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P
   __Pyx_GIVEREF(__pyx_2);
   __pyx_1 = 0;
   __pyx_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 294; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":295
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 384; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":385
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     validate_array(src)
  *     assert_dtype(src, [UINT8, FLOAT32])
  *     assert_nchannels(src, [1])             # <<<<<<<<<<<<<<
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 385; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 295; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":297
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 385; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":387
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     assert_nchannels(src, [1])
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):             # <<<<<<<<<<<<<<
@@ -2738,29 +3715,50 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P
   }
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":298
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":388
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  *         raise ValueError('aperture_size must be 3, 5, or 7')             # <<<<<<<<<<<<<<
  * 
  *     if out is not None:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_72);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_72);
     __Pyx_GIVEREF(__pyx_kp_72);
     __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_145);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_145);
+    __Pyx_GIVEREF(__pyx_kp_145);
+    __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_5, 0, 0);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 298; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 388; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     goto __pyx_L6;
   }
   __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":300
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":390
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         raise ValueError('aperture_size must be 3, 5, or 7')
  * 
  *     if out is not None:             # <<<<<<<<<<<<<<
@@ -2770,63 +3768,106 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P
   __pyx_t_4 = (((PyObject *)__pyx_v_out) != Py_None);
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":301
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":391
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if out is not None:
  *         validate_array(out)             # <<<<<<<<<<<<<<
  *         assert_same_shape(src, out)
  *         assert_dtype(out, [FLOAT32])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 301; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":302
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 391; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":392
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     if out is not None:
  *         validate_array(out)
  *         assert_same_shape(src, out)             # <<<<<<<<<<<<<<
  *         assert_dtype(out, [FLOAT32])
  *         assert_not_sharing_data(src, out)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 302; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":303
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":393
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         validate_array(out)
  *         assert_same_shape(src, out)
  *         assert_dtype(out, [FLOAT32])             # <<<<<<<<<<<<<<
  *         assert_not_sharing_data(src, out)
  *     else:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 303; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_1);
     __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 303; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_5 = PyList_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(((PyObject *)__pyx_t_5));
     PyList_SET_ITEM(__pyx_t_5, 0, __pyx_1);
     __Pyx_GIVEREF(__pyx_1);
     __pyx_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 303; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":304
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_5)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":394
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         assert_same_shape(src, out)
  *         assert_dtype(out, [FLOAT32])
  *         assert_not_sharing_data(src, out)             # <<<<<<<<<<<<<<
  *     else:
  *         out = new_array_like_diff_dtype(src, FLOAT32)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 304; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     goto __pyx_L7;
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":306
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":396
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         assert_not_sharing_data(src, out)
  *     else:
  *         out = new_array_like_diff_dtype(src, FLOAT32)             # <<<<<<<<<<<<<<
  * 
  *     cdef IplImage srcimg
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_2);
     __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_2)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 306; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_2);
+    __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_2)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 396; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
     __Pyx_DECREF(((PyObject *)__pyx_v_out));
@@ -2835,7 +3876,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P
   }
   __pyx_L7:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":310
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":400
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage srcimg
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
@@ -2844,7 +3889,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":311
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":401
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)
  *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
@@ -2853,7 +3902,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":313
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":403
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(out, &outimg)
  * 
  *     c_cvPreCornerDetect(&srcimg, &outimg, aperture_size)             # <<<<<<<<<<<<<<
@@ -2862,7 +3915,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P
  */
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvPreCornerDetect((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_aperture_size);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":315
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":405
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     c_cvPreCornerDetect(&srcimg, &outimg, aperture_size)
  * 
  *     return out             # <<<<<<<<<<<<<<
@@ -2890,7 +3947,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect(P
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":317
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":407
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     return out
  * 
  * def cvCornerEigenValsAndVecs(np.ndarray src, int block_size=3,             # <<<<<<<<<<<<<<
@@ -2947,16 +4008,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerEigenValsAndVecs") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 317; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     if (values[1]) {
       __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 317; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerEigenValsAndVecs") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 407; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    if (values[1]) {
+      __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 407; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_block_size = 3;
     }
     if (values[2]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 408; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_aperture_size = 3;
     }
@@ -2964,8 +4037,13 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
     __pyx_v_block_size = 3;
     __pyx_v_aperture_size = 3;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       case  3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 318; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 317; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      case  3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 408; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 407; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
       break;
       default: goto __pyx_L5_argtuple_error;
@@ -2973,50 +4051,85 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvCornerEigenValsAndVecs", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 317; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+  __Pyx_RaiseArgtupleInvalid("cvCornerEigenValsAndVecs", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 407; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCornerEigenValsAndVecs");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_v_out = Py_None; __Pyx_INCREF(Py_None);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 317; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":330
+=======
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 407; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":420
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     # given source array
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     assert_nchannels(src, [1])
  *     assert_dtype(src, [UINT8, FLOAT32])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 330; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":331
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":421
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)
  *     assert_nchannels(src, [1])             # <<<<<<<<<<<<<<
  *     assert_dtype(src, [UINT8, FLOAT32])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 331; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":332
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":422
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     validate_array(src)
  *     assert_nchannels(src, [1])
  *     assert_dtype(src, [UINT8, FLOAT32])             # <<<<<<<<<<<<<<
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 332; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 332; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 332; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
@@ -3024,10 +4137,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
   __Pyx_GIVEREF(__pyx_2);
   __pyx_1 = 0;
   __pyx_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 332; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":334
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 422; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":424
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     assert_dtype(src, [UINT8, FLOAT32])
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):             # <<<<<<<<<<<<<<
@@ -3046,29 +4166,50 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
   }
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":335
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":425
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  *         raise ValueError('aperture_size must be 3, 5, or 7')             # <<<<<<<<<<<<<<
  * 
  *     cdef np.npy_intp outshape[2]
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_73);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_73);
     __Pyx_GIVEREF(__pyx_kp_73);
     __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 425; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_146);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_146);
+    __Pyx_GIVEREF(__pyx_kp_146);
+    __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 425; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_5, 0, 0);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 335; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 425; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     goto __pyx_L6;
   }
   __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":338
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":428
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     cdef np.npy_intp outshape[2]
  *     outshape[0] = src.shape[0]             # <<<<<<<<<<<<<<
@@ -3077,7 +4218,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
  */
   (__pyx_v_outshape[0]) = (__pyx_v_src->dimensions[0]);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":339
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":429
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef np.npy_intp outshape[2]
  *     outshape[0] = src.shape[0]
  *     outshape[1] = src.shape[1] * <np.npy_intp>6             # <<<<<<<<<<<<<<
@@ -3086,23 +4231,37 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
  */
   (__pyx_v_outshape[1]) = ((__pyx_v_src->dimensions[1]) * ((npy_intp)6));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":341
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":431
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     outshape[1] = src.shape[1] * <np.npy_intp>6
  * 
  *     out = new_array(2, outshape, FLOAT32)             # <<<<<<<<<<<<<<
  * 
  *     cdef IplImage srcimg
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_outshape, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 341; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 431; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_outshape, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 431; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
   __Pyx_DECREF(__pyx_v_out);
   __pyx_v_out = __pyx_t_5;
   __pyx_t_5 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":345
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":435
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage srcimg
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
@@ -3111,17 +4270,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":346
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":436
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)
  *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
  * 
  *     c_cvCornerEigenValsAndVecs(&srcimg, &outimg, block_size, aperture_size)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 346; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg));
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":348
+=======
+  if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 436; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":438
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(out, &outimg)
  * 
  *     c_cvCornerEigenValsAndVecs(&srcimg, &outimg, block_size, aperture_size)             # <<<<<<<<<<<<<<
@@ -3130,7 +4300,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
  */
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerEigenValsAndVecs((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_block_size, __pyx_v_aperture_size);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":350
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":440
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     c_cvCornerEigenValsAndVecs(&srcimg, &outimg, block_size, aperture_size)
  * 
  *     return out.reshape(out.shape[0], -1, 6)             # <<<<<<<<<<<<<<
@@ -3138,6 +4312,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
  * def cvCornerMinEigenVal(np.ndarray src, int block_size=3,
  */
   __Pyx_XDECREF(__pyx_r);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_5 = PyObject_GetAttr(__pyx_v_out, __pyx_kp_reshape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_5);
   __pyx_t_2 = PyObject_GetAttr(__pyx_v_out, __pyx_kp_shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -3146,6 +4321,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
   __Pyx_GOTREF(__pyx_2);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_5 = PyObject_GetAttr(__pyx_v_out, __pyx_kp_reshape); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 440; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_v_out, __pyx_kp_shape); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 440; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_2 = __Pyx_GetItemInt(__pyx_t_2, 0, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 440; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_t_2 = PyTuple_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 440; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_2);
   __Pyx_GIVEREF(__pyx_2);
@@ -3156,7 +4341,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
   PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_int_6);
   __Pyx_GIVEREF(__pyx_int_6);
   __pyx_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_6 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 350; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_6 = PyObject_Call(__pyx_t_5, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 440; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(__pyx_t_6);
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
@@ -3181,7 +4370,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAn
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":352
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":442
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     return out.reshape(out.shape[0], -1, 6)
  * 
  * def cvCornerMinEigenVal(np.ndarray src, int block_size=3,             # <<<<<<<<<<<<<<
@@ -3236,16 +4429,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerMinEigenVal") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     if (values[1]) {
       __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerMinEigenVal") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    if (values[1]) {
+      __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_block_size = 3;
     }
     if (values[2]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_aperture_size = 3;
     }
@@ -3253,8 +4458,13 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal
     __pyx_v_block_size = 3;
     __pyx_v_aperture_size = 3;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       case  3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 353; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      case  3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
       break;
       default: goto __pyx_L5_argtuple_error;
@@ -3262,50 +4472,85 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvCornerMinEigenVal", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+  __Pyx_RaiseArgtupleInvalid("cvCornerMinEigenVal", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCornerMinEigenVal");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_v_out = Py_None; __Pyx_INCREF(Py_None);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 352; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":363
+=======
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":453
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     # given source array
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     assert_nchannels(src, [1])
  *     assert_dtype(src, [UINT8, FLOAT32])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 363; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":364
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 453; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":454
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)
  *     assert_nchannels(src, [1])             # <<<<<<<<<<<<<<
  *     assert_dtype(src, [UINT8, FLOAT32])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 454; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 364; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":365
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 454; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":455
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     validate_array(src)
  *     assert_nchannels(src, [1])
  *     assert_dtype(src, [UINT8, FLOAT32])             # <<<<<<<<<<<<<<
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 365; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 365; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 365; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
@@ -3313,10 +4558,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal
   __Pyx_GIVEREF(__pyx_2);
   __pyx_1 = 0;
   __pyx_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 365; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":367
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 455; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":457
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     assert_dtype(src, [UINT8, FLOAT32])
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):             # <<<<<<<<<<<<<<
@@ -3335,45 +4587,76 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal
   }
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":368
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":458
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  *         raise ValueError('aperture_size must be 3, 5, or 7')             # <<<<<<<<<<<<<<
  * 
  *     out = new_array_like_diff_dtype(src, FLOAT32)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_74);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_74);
     __Pyx_GIVEREF(__pyx_kp_74);
     __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 458; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_147);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_147);
+    __Pyx_GIVEREF(__pyx_kp_147);
+    __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 458; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_5, 0, 0);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 368; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 458; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     goto __pyx_L6;
   }
   __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":370
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":460
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         raise ValueError('aperture_size must be 3, 5, or 7')
  * 
  *     out = new_array_like_diff_dtype(src, FLOAT32)             # <<<<<<<<<<<<<<
  * 
  *     cdef IplImage srcimg
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 370; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 370; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 460; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 460; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
   __Pyx_DECREF(__pyx_v_out);
   __pyx_v_out = __pyx_t_5;
   __pyx_t_5 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":374
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":464
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage srcimg
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
@@ -3382,17 +4665,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":375
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":465
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)
  *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
  * 
  *     c_cvCornerMinEigenVal(&srcimg, &outimg, block_size, aperture_size)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 375; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg));
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":377
+=======
+  if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 465; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":467
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(out, &outimg)
  * 
  *     c_cvCornerMinEigenVal(&srcimg, &outimg, block_size, aperture_size)             # <<<<<<<<<<<<<<
@@ -3401,7 +4695,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal
  */
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerMinEigenVal((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_block_size, __pyx_v_aperture_size);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":379
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":469
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     c_cvCornerMinEigenVal(&srcimg, &outimg, block_size, aperture_size)
  * 
  *     return out             # <<<<<<<<<<<<<<
@@ -3429,7 +4727,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":381
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":471
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     return out
  * 
  * def cvCornerHarris(np.ndarray src, int block_size=3, int aperture_size=3,             # <<<<<<<<<<<<<<
@@ -3491,21 +4793,37 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerHarris") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     if (values[1]) {
       __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCornerHarris") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    if (values[1]) {
+      __pyx_v_block_size = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_block_size = 3;
     }
     if (values[2]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_aperture_size = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_aperture_size = 3;
     }
     if (values[3]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_k = __pyx_PyFloat_AsDouble(values[3]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 382; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_k = __pyx_PyFloat_AsDouble(values[3]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 472; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_k = 0.040000000000000001;
     }
@@ -3514,9 +4832,15 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb
     __pyx_v_aperture_size = 3;
     __pyx_v_k = 0.040000000000000001;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       case  4: __pyx_v_k = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 382; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      case  4: __pyx_v_k = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 472; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  3: __pyx_v_aperture_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_aperture_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  2: __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
       break;
       default: goto __pyx_L5_argtuple_error;
@@ -3524,50 +4848,85 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvCornerHarris", 0, 1, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+  __Pyx_RaiseArgtupleInvalid("cvCornerHarris", 0, 1, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCornerHarris");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_v_out = Py_None; __Pyx_INCREF(Py_None);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 381; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":392
+=======
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":482
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     # given source array
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     assert_nchannels(src, [1])
  *     assert_dtype(src, [UINT8, FLOAT32])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 392; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":393
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 482; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":483
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)
  *     assert_nchannels(src, [1])             # <<<<<<<<<<<<<<
  *     assert_dtype(src, [UINT8, FLOAT32])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 393; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":394
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 483; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":484
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     validate_array(src)
  *     assert_nchannels(src, [1])
  *     assert_dtype(src, [UINT8, FLOAT32])             # <<<<<<<<<<<<<<
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
@@ -3575,10 +4934,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb
   __Pyx_GIVEREF(__pyx_2);
   __pyx_1 = 0;
   __pyx_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 394; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":396
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 484; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":486
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     assert_dtype(src, [UINT8, FLOAT32])
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):             # <<<<<<<<<<<<<<
@@ -3597,45 +4963,76 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb
   }
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":397
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":487
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if (aperture_size != 3 and aperture_size != 5 and aperture_size != 7):
  *         raise ValueError('aperture_size must be 3, 5, or 7')             # <<<<<<<<<<<<<<
  * 
  *     out = new_array_like_diff_dtype(src, FLOAT32)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_75);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_75);
     __Pyx_GIVEREF(__pyx_kp_75);
     __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_148);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_148);
+    __Pyx_GIVEREF(__pyx_kp_148);
+    __pyx_t_5 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_5, 0, 0);
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 397; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 487; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     goto __pyx_L6;
   }
   __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":399
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":489
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         raise ValueError('aperture_size must be 3, 5, or 7')
  * 
  *     out = new_array_like_diff_dtype(src, FLOAT32)             # <<<<<<<<<<<<<<
  * 
  *     cdef IplImage srcimg
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 399; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 399; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 489; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
   __Pyx_DECREF(__pyx_v_out);
   __pyx_v_out = __pyx_t_5;
   __pyx_t_5 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":403
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":493
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage srcimg
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
@@ -3644,17 +5041,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":404
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":494
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)
  *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
  * 
  *     c_cvCornerHarris(&srcimg, &outimg, block_size, aperture_size, k)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 404; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg));
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":406
+=======
+  if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 494; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(((PyArrayObject *)__pyx_v_out), (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":496
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(out, &outimg)
  * 
  *     c_cvCornerHarris(&srcimg, &outimg, block_size, aperture_size, k)             # <<<<<<<<<<<<<<
@@ -3663,7 +5071,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb
  */
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerHarris((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_block_size, __pyx_v_aperture_size, __pyx_v_k);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":408
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":498
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     c_cvCornerHarris(&srcimg, &outimg, block_size, aperture_size, k)
  * 
  *     return out             # <<<<<<<<<<<<<<
@@ -3691,7 +5103,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris(PyOb
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":410
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":500
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     return out
  * 
  * def cvFindCornerSubPix(np.ndarray src, np.ndarray corners, int count, win,             # <<<<<<<<<<<<<<
@@ -3727,7 +5143,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
   if (unlikely(__pyx_kwds)) {
     Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
     PyObject* values[7] = {0,0,0,0,0,0,0};
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     values[4] = __pyx_k_45;
+=======
+    values[4] = __pyx_k_120;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  7: values[6] = PyTuple_GET_ITEM(__pyx_args, 6);
       case  6: values[5] = PyTuple_GET_ITEM(__pyx_args, 5);
@@ -3748,19 +5168,31 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
       values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_corners);
       if (likely(values[1])) kw_args--;
       else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
         __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+        __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       }
       case  2:
       values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_count);
       if (likely(values[2])) kw_args--;
       else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
         __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+        __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       }
       case  3:
       values[3] = PyDict_GetItem(__pyx_kwds, __pyx_kp_win);
       if (likely(values[3])) kw_args--;
       else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
         __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+        __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       }
       case  4:
       if (kw_args > 0) {
@@ -3779,6 +5211,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFindCornerSubPix") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
@@ -3788,28 +5221,57 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
     __pyx_v_zero_zone = values[4];
     if (values[5]) {
       __pyx_v_iterations = __Pyx_PyInt_AsInt(values[5]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 411; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFindCornerSubPix") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_corners = ((PyArrayObject *)values[1]);
+    __pyx_v_count = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_win = values[3];
+    __pyx_v_zero_zone = values[4];
+    if (values[5]) {
+      __pyx_v_iterations = __Pyx_PyInt_AsInt(values[5]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_iterations = 0;
     }
     if (values[6]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_epsilon = __pyx_PyFloat_AsDouble(values[6]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 412; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_epsilon = __pyx_PyFloat_AsDouble(values[6]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 502; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_epsilon = 1.0000000000000001e-05;
     }
   } else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_v_zero_zone = __pyx_k_45;
+=======
+    __pyx_v_zero_zone = __pyx_k_120;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __pyx_v_iterations = 0;
     __pyx_v_epsilon = 1.0000000000000001e-05;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  7:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_epsilon = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 6)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 412; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  6:
       __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 411; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_epsilon = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 6)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 502; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  6:
+      __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  5:
       __pyx_v_zero_zone = PyTuple_GET_ITEM(__pyx_args, 4);
       case  4:
       __pyx_v_win = PyTuple_GET_ITEM(__pyx_args, 3);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_count = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_count = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __pyx_v_corners = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
       __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
       break;
@@ -3818,97 +5280,168 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+  __Pyx_RaiseArgtupleInvalid("cvFindCornerSubPix", 0, 4, 7, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvFindCornerSubPix");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_corners), __pyx_ptype_5numpy_ndarray, 1, "corners", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 410; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":420
+=======
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_corners), __pyx_ptype_5numpy_ndarray, 1, "corners", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 500; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":510
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     """
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     validate_array(corners)
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 420; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":421
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 510; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":511
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)
  *     validate_array(corners)             # <<<<<<<<<<<<<<
  * 
  *     assert_nchannels(src, [1])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_corners); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 421; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":423
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_corners); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 511; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":513
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     validate_array(corners)
  * 
  *     assert_nchannels(src, [1])             # <<<<<<<<<<<<<<
  *     assert_dtype(src, [UINT8])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 423; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":424
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 513; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":514
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     assert_nchannels(src, [1])
  *     assert_dtype(src, [UINT8])             # <<<<<<<<<<<<<<
  * 
  *     assert_nchannels(corners, [1])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 514; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 514; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
   __pyx_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 424; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":426
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 514; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":516
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     assert_dtype(src, [UINT8])
  * 
  *     assert_nchannels(corners, [1])             # <<<<<<<<<<<<<<
  *     assert_dtype(corners, [FLOAT32])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 426; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 516; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 426; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":427
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 516; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":517
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     assert_nchannels(corners, [1])
  *     assert_dtype(corners, [FLOAT32])             # <<<<<<<<<<<<<<
  * 
  *     # make sure the number of points
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
   __pyx_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 427; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":435
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 517; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":525
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     # flat anyway, but regardless, the validate_array function ensures
  *     # that it is 2D
  *     cdef int nbytes = <int> get_array_nbytes(corners)             # <<<<<<<<<<<<<<
@@ -3917,7 +5450,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
  */
   __pyx_v_nbytes = ((int)__pyx_f_7scikits_5image_6opencv_14opencv_backend_get_array_nbytes(__pyx_v_corners));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":436
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":526
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     # that it is 2D
  *     cdef int nbytes = <int> get_array_nbytes(corners)
  *     if nbytes != (count * 2 * 4):             # <<<<<<<<<<<<<<
@@ -3927,29 +5464,50 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
   __pyx_t_3 = (__pyx_v_nbytes != ((__pyx_v_count * 2) * 4));
   if (__pyx_t_3) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":437
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":527
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef int nbytes = <int> get_array_nbytes(corners)
  *     if nbytes != (count * 2 * 4):
  *         raise ValueError('The number of declared points is different '             # <<<<<<<<<<<<<<
  *                          'than exists in the array.')
  *     cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(((PyObject *)__pyx_t_2));
     __Pyx_INCREF(__pyx_kp_76);
     PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_76);
     __Pyx_GIVEREF(__pyx_kp_76);
     __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_kp_149);
+    PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_kp_149);
+    __Pyx_GIVEREF(__pyx_kp_149);
+    __pyx_t_4 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(__pyx_t_4);
     __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
     __Pyx_Raise(__pyx_t_4, 0, 0);
     __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 437; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 527; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     goto __pyx_L6;
   }
   __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":439
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":529
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         raise ValueError('The number of declared points is different '
  *                          'than exists in the array.')
  *     cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners)             # <<<<<<<<<<<<<<
@@ -3958,13 +5516,18 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
  */
   __pyx_v_cvcorners = __pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr(__pyx_v_corners);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":442
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":532
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     cdef CvSize cvwin
  *     cvwin.height = <int> win[0]             # <<<<<<<<<<<<<<
  *     cvwin.width = <int> win[1]
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetItemInt(__pyx_v_win, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 442; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -3972,12 +5535,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
   __pyx_v_cvwin.height = ((int)__pyx_t_1);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":443
+=======
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_win, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 532; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_cvwin.height = ((int)__pyx_t_1);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":533
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef CvSize cvwin
  *     cvwin.height = <int> win[0]
  *     cvwin.width = <int> win[1]             # <<<<<<<<<<<<<<
  * 
  *     cdef CvSize cvzerozone
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetItemInt(__pyx_v_win, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 443; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -3985,12 +5558,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
   __pyx_v_cvwin.width = ((int)__pyx_t_1);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":446
+=======
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_win, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 533; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_cvwin.width = ((int)__pyx_t_1);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":536
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     cdef CvSize cvzerozone
  *     cvzerozone.height = <int> zero_zone[0]             # <<<<<<<<<<<<<<
  *     cvzerozone.width = <int> zero_zone[1]
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetItemInt(__pyx_v_zero_zone, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 446; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 446; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -3998,12 +5581,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
   __pyx_v_cvzerozone.height = ((int)__pyx_t_1);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":447
+=======
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_zero_zone, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 536; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_cvzerozone.height = ((int)__pyx_t_1);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":537
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef CvSize cvzerozone
  *     cvzerozone.height = <int> zero_zone[0]
  *     cvzerozone.width = <int> zero_zone[1]             # <<<<<<<<<<<<<<
  * 
  *     cdef IplImage srcimg
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetItemInt(__pyx_v_zero_zone, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 447; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 447; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -4011,6 +5604,15 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
   __pyx_v_cvzerozone.width = ((int)__pyx_t_1);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":450
+=======
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_zero_zone, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 537; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_cvzerozone.width = ((int)__pyx_t_1);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":540
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     cdef IplImage srcimg
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
@@ -4019,7 +5621,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":453
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":543
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     cdef CvTermCriteria crit
  *     crit = get_cvTermCriteria(iterations, epsilon)             # <<<<<<<<<<<<<<
@@ -4028,7 +5634,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
  */
   __pyx_v_crit = __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_cvTermCriteria(__pyx_v_iterations, __pyx_v_epsilon);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":455
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":545
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     crit = get_cvTermCriteria(iterations, epsilon)
  * 
  *     c_cvFindCornerSubPix(&srcimg, cvcorners, count, cvwin, cvzerozone, crit)             # <<<<<<<<<<<<<<
@@ -4037,7 +5647,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
  */
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindCornerSubPix((&__pyx_v_srcimg), __pyx_v_cvcorners, __pyx_v_count, __pyx_v_cvwin, __pyx_v_cvzerozone, __pyx_v_crit);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":457
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":547
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     c_cvFindCornerSubPix(&srcimg, cvcorners, count, cvwin, cvzerozone, crit)
  * 
  *     return None             # <<<<<<<<<<<<<<
@@ -4063,7 +5677,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix(
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":459
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":549
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     return None
  * 
  * def cvGoodFeaturesToTrack(np.ndarray src, int corner_count,             # <<<<<<<<<<<<<<
@@ -4126,19 +5744,31 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra
       values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_corner_count);
       if (likely(values[1])) kw_args--;
       else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
         __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+        __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       }
       case  2:
       values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_quality_level);
       if (likely(values[2])) kw_args--;
       else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
         __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+        __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       }
       case  3:
       values[3] = PyDict_GetItem(__pyx_kwds, __pyx_kp_min_distance);
       if (likely(values[3])) kw_args--;
       else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
         __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+        __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       }
       case  4:
       if (kw_args > 0) {
@@ -4162,6 +5792,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvGoodFeaturesToTrack") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
@@ -4171,16 +5802,35 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra
     __pyx_v_mask = ((PyArrayObject *)values[4]);
     if (values[5]) {
       __pyx_v_block_size = __Pyx_PyInt_AsInt(values[5]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 461; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvGoodFeaturesToTrack") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_corner_count = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_corner_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_quality_level = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_min_distance = __pyx_PyFloat_AsDouble(values[3]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    __pyx_v_mask = ((PyArrayObject *)values[4]);
+    if (values[5]) {
+      __pyx_v_block_size = __Pyx_PyInt_AsInt(values[5]); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 551; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_block_size = 3;
     }
     if (values[6]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_use_harris = __Pyx_PyInt_AsInt(values[6]); if (unlikely((__pyx_v_use_harris == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_use_harris = __Pyx_PyInt_AsInt(values[6]); if (unlikely((__pyx_v_use_harris == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_use_harris = 0;
     }
     if (values[7]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_k = __pyx_PyFloat_AsDouble(values[7]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_k = __pyx_PyFloat_AsDouble(values[7]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_k = 0.040000000000000001;
     }
@@ -4191,6 +5841,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra
     __pyx_v_k = 0.040000000000000001;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  8:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_k = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 7)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  7:
       __pyx_v_use_harris = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 6)); if (unlikely((__pyx_v_use_harris == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 462; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
@@ -4202,6 +5853,19 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra
       __pyx_v_min_distance = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 460; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       __pyx_v_quality_level = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 460; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       __pyx_v_corner_count = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_corner_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_k = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 7)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  7:
+      __pyx_v_use_harris = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 6)); if (unlikely((__pyx_v_use_harris == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 552; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  6:
+      __pyx_v_block_size = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely((__pyx_v_block_size == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 551; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  5:
+      __pyx_v_mask = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 4));
+      case  4:
+      __pyx_v_min_distance = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      __pyx_v_quality_level = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 550; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      __pyx_v_corner_count = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_corner_count == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
       break;
       default: goto __pyx_L5_argtuple_error;
@@ -4209,35 +5873,60 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+  __Pyx_RaiseArgtupleInvalid("cvGoodFeaturesToTrack", 0, 4, 8, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvGoodFeaturesToTrack");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 459; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_mask), __pyx_ptype_5numpy_ndarray, 1, "mask", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 461; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":469
+=======
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 549; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_mask), __pyx_ptype_5numpy_ndarray, 1, "mask", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 551; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":559
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     """
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     assert_dtype(src, [UINT8, FLOAT32])
  *     assert_nchannels(src, [1])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 469; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":470
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 559; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":560
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)
  *     assert_dtype(src, [UINT8, FLOAT32])             # <<<<<<<<<<<<<<
  *     assert_nchannels(src, [1])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 470; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 470; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 470; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
@@ -4245,52 +5934,88 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra
   __Pyx_GIVEREF(__pyx_2);
   __pyx_1 = 0;
   __pyx_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 470; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":471
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 560; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":561
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     validate_array(src)
  *     assert_dtype(src, [UINT8, FLOAT32])
  *     assert_nchannels(src, [1])             # <<<<<<<<<<<<<<
  * 
  *     cdef np.ndarray eig = new_array_like_diff_dtype(src, FLOAT32)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 471; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":473
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 561; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":563
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     assert_nchannels(src, [1])
  * 
  *     cdef np.ndarray eig = new_array_like_diff_dtype(src, FLOAT32)             # <<<<<<<<<<<<<<
  *     cdef np.ndarray temp = new_array_like(eig)
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 473; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 473; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 563; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 563; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_v_eig = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":474
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":564
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     cdef np.ndarray eig = new_array_like_diff_dtype(src, FLOAT32)
  *     cdef np.ndarray temp = new_array_like(eig)             # <<<<<<<<<<<<<<
  * 
  *     cdef np.npy_intp cornershape[2]
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_eig)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 474; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_eig)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 564; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(__pyx_t_2);
   __pyx_v_temp = ((PyArrayObject *)__pyx_t_2);
   __pyx_t_2 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":477
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":567
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     cdef np.npy_intp cornershape[2]
  *     cornershape[0] = <np.npy_intp>corner_count             # <<<<<<<<<<<<<<
@@ -4299,15 +6024,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTra
  */
   (__pyx_v_cornershape[0]) = ((npy_intp)__pyx_v_corner_count);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":478
  *     cdef np.npy_intp cornershape[2]
  *     cornershape[0] = <np.npy_intp>corner_count
  *     cornershape[1] = 2             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":568
+ *     cdef np.npy_intp cornershape[2]
+ *     cornershape[0] = <np.npy_intp>corner_count
+ *     cornershape[1] = 2             # <<<<<<<<<<<<<<
  * 
  *     cdef np.ndarray out = new_array(2, cornershape, FLOAT32)
  */
   (__pyx_v_cornershape[1]) = 2;
 
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":570
+ *     cornershape[1] = 2
+ * 
+ *     cdef np.ndarray out = new_array(2, cornershape, FLOAT32)             # <<<<<<<<<<<<<<
+ *     cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(out)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     cdef np.ndarray out = new_array(2, cornershape, FLOAT32)
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  (__pyx_v_cornershape[1]) = 2;
+
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":480
  *     cornershape[1] = 2
  * 
@@ -4781,8 +6524,126 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP
  *     '''
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     validate_array(warpmat)
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 570; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_cornershape, __pyx_2)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 570; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_v_out = ((PyArrayObject *)__pyx_t_2);
+  __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":571
+ * 
+ *     cdef np.ndarray out = new_array(2, cornershape, FLOAT32)
+ *     cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(out)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef int ncorners_found
+ */
+  __pyx_v_cvcorners = __pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr(__pyx_v_out);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":574
+ * 
+ *     cdef int ncorners_found
+ *     ncorners_found = corner_count             # <<<<<<<<<<<<<<
+ * 
+ *     cdef IplImage srcimg
+ */
+  __pyx_v_ncorners_found = __pyx_v_corner_count;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":581
+ *     cdef IplImage *maskimg
+ * 
+ *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(eig, &eigimg)
+ *     populate_iplimage(temp, &tempimg)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":582
+ * 
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(eig, &eigimg)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(temp, &tempimg)
+ *     if mask is None:
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_eig, (&__pyx_v_eigimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":583
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(eig, &eigimg)
+ *     populate_iplimage(temp, &tempimg)             # <<<<<<<<<<<<<<
+ *     if mask is None:
+ *         maskimg = NULL
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_temp, (&__pyx_v_tempimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":584
+ *     populate_iplimage(eig, &eigimg)
+ *     populate_iplimage(temp, &tempimg)
+ *     if mask is None:             # <<<<<<<<<<<<<<
+ *         maskimg = NULL
+ *     else:
+ */
+  __pyx_t_3 = (((PyObject *)__pyx_v_mask) == Py_None);
+  if (__pyx_t_3) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":585
+ *     populate_iplimage(temp, &tempimg)
+ *     if mask is None:
+ *         maskimg = NULL             # <<<<<<<<<<<<<<
+ *     else:
+ *         validate_array(mask)
+ */
+    __pyx_v_maskimg = NULL;
+    goto __pyx_L6;
+  }
+  /*else*/ {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":587
+ *         maskimg = NULL
+ *     else:
+ *         validate_array(mask)             # <<<<<<<<<<<<<<
+ *         assert_nchannels(mask, [1])
+ *         populate_iplimage(mask, maskimg)
+ */
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_mask); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 587; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":588
+ *     else:
+ *         validate_array(mask)
+ *         assert_nchannels(mask, [1])             # <<<<<<<<<<<<<<
+ *         populate_iplimage(mask, maskimg)
  * 
  */
+    __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 588; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    __Pyx_INCREF(__pyx_int_1);
+    PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+    __Pyx_GIVEREF(__pyx_int_1);
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_mask, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 588; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":589
+ *         validate_array(mask)
+ *         assert_nchannels(mask, [1])
+ *         populate_iplimage(mask, maskimg)             # <<<<<<<<<<<<<<
+ * 
+ *     c_cvGoodFeaturesToTrack(&srcimg, &eigimg, &tempimg, cvcorners,
+ */
+    __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_mask, __pyx_v_maskimg);
+  }
+  __pyx_L6:;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":594
+ *                             &ncorners_found, quality_level, min_distance,
+ *                             maskimg, block_size,
+ *                             use_harris, k)             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     return out[:ncorners_found]
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 562; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":563
@@ -4845,9 +6706,173 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP
  * 
  *     assert warpmat.shape[0] == 2, 'warpmat must be 2x3'
  *     assert warpmat.shape[1] == 3, 'warpmat must be 2x3'             # <<<<<<<<<<<<<<
+=======
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGoodFeaturesToTrack((&__pyx_v_srcimg), (&__pyx_v_eigimg), (&__pyx_v_tempimg), __pyx_v_cvcorners, (&__pyx_v_ncorners_found), __pyx_v_quality_level, __pyx_v_min_distance, __pyx_v_maskimg, __pyx_v_block_size, __pyx_v_use_harris, __pyx_v_k);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":596
+ *                             use_harris, k)
+ * 
+ *     return out[:ncorners_found]             # <<<<<<<<<<<<<<
+ * 
+ * def cvGetRectSubPix(np.ndarray src, size, center):
+ */
+  __Pyx_XDECREF(__pyx_r);
+  __pyx_1 = PySequence_GetSlice(((PyObject *)__pyx_v_out), 0, __pyx_v_ncorners_found); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 596; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_r = __pyx_1;
+  __pyx_1 = 0;
+  goto __pyx_L0;
+
+  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  goto __pyx_L0;
+  __pyx_L1_error:;
+  __Pyx_XDECREF(__pyx_1);
+  __Pyx_XDECREF(__pyx_2);
+  __Pyx_XDECREF(__pyx_t_2);
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvGoodFeaturesToTrack");
+  __pyx_r = NULL;
+  __pyx_L0:;
+  __Pyx_XDECREF((PyObject *)__pyx_v_eig);
+  __Pyx_XDECREF((PyObject *)__pyx_v_temp);
+  __Pyx_XDECREF((PyObject *)__pyx_v_out);
+  __Pyx_XGIVEREF(__pyx_r);
+  __Pyx_FinishRefcountContext();
+  return __pyx_r;
+}
+
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":598
+ *     return out[:ncorners_found]
+ * 
+ * def cvGetRectSubPix(np.ndarray src, size, center):             # <<<<<<<<<<<<<<
+ *     ''' Retrieves the pixel rectangle from an image with
+ *     sub-pixel accuracy.
+ */
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static char __pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix[] = " Retrieves the pixel rectangle from an image with\n    sub-pixel accuracy.\n\n    Paramters:\n        src - source image.\n        size - two tuple (height, width) of rectangle (ints)\n        center - two tuple (x, y) of rectangle center (floats)\n\n        the center must lie within the image, but the rectangle\n        may extend beyond the bounds of the image, at which point\n        the border is replicated.\n\n    Returns:\n        A new image of the extracted rectangle. The same dtype as the src image.\n    ";
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+  PyArrayObject *__pyx_v_src = 0;
+  PyObject *__pyx_v_size = 0;
+  PyObject *__pyx_v_center = 0;
+  npy_intp *__pyx_v_shape;
+  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f __pyx_v_cvcenter;
+  PyArrayObject *__pyx_v_out = 0;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg;
+  PyObject *__pyx_r = NULL;
+  PyObject *__pyx_1 = 0;
+  int __pyx_t_1;
+  npy_intp __pyx_t_2;
+  float __pyx_t_3;
+  PyObject *__pyx_t_4 = NULL;
+  PyObject *__pyx_t_5 = NULL;
+  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_size,&__pyx_kp_center,0};
+  __Pyx_SetupRefcountContext("cvGetRectSubPix");
+  __pyx_self = __pyx_self;
+  if (unlikely(__pyx_kwds)) {
+    Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+    PyObject* values[3] = {0,0,0};
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
+      case  2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
+      case  1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
+      case  0: break;
+      default: goto __pyx_L5_argtuple_error;
+    }
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  0:
+      values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_src);
+      if (likely(values[0])) kw_args--;
+      else goto __pyx_L5_argtuple_error;
+      case  1:
+      values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_size);
+      if (likely(values[1])) kw_args--;
+      else {
+        __Pyx_RaiseArgtupleInvalid("cvGetRectSubPix", 1, 3, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 598; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      }
+      case  2:
+      values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_center);
+      if (likely(values[2])) kw_args--;
+      else {
+        __Pyx_RaiseArgtupleInvalid("cvGetRectSubPix", 1, 3, 3, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 598; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      }
+    }
+    if (unlikely(kw_args > 0)) {
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvGetRectSubPix") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 598; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_size = values[1];
+    __pyx_v_center = values[2];
+  } else if (PyTuple_GET_SIZE(__pyx_args) != 3) {
+    goto __pyx_L5_argtuple_error;
+  } else {
+    __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+    __pyx_v_size = PyTuple_GET_ITEM(__pyx_args, 1);
+    __pyx_v_center = PyTuple_GET_ITEM(__pyx_args, 2);
+  }
+  goto __pyx_L4_argument_unpacking_done;
+  __pyx_L5_argtuple_error:;
+  __Pyx_RaiseArgtupleInvalid("cvGetRectSubPix", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 598; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvGetRectSubPix");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 598; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":615
+ *     '''
+ * 
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef np.npy_intp* shape = clone_array_shape(src)
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 615; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":617
+ *     validate_array(src)
+ * 
+ *     cdef np.npy_intp* shape = clone_array_shape(src)             # <<<<<<<<<<<<<<
+ *     shape[0] = <np.npy_intp>size[0]
+ *     shape[1] = <np.npy_intp>size[1]
+ */
+  __pyx_v_shape = __pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_shape(__pyx_v_src);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":618
+ * 
+ *     cdef np.npy_intp* shape = clone_array_shape(src)
+ *     shape[0] = <np.npy_intp>size[0]             # <<<<<<<<<<<<<<
+ *     shape[1] = <np.npy_intp>size[1]
+ * 
+ */
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = __Pyx_PyInt_from_py_npy_intp(__pyx_1); if (unlikely((__pyx_t_2 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 618; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  (__pyx_v_shape[0]) = ((npy_intp)__pyx_t_2);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":619
+ *     cdef np.npy_intp* shape = clone_array_shape(src)
+ *     shape[0] = <np.npy_intp>size[0]
+ *     shape[1] = <np.npy_intp>size[1]             # <<<<<<<<<<<<<<
+ * 
+ *     cdef CvPoint2D32f cvcenter
+ */
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 619; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = __Pyx_PyInt_from_py_npy_intp(__pyx_1); if (unlikely((__pyx_t_2 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 619; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  (__pyx_v_shape[1]) = ((npy_intp)__pyx_t_2);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":622
+ * 
+ *     cdef CvPoint2D32f cvcenter
+ *     cvcenter.x = <float>center[0]             # <<<<<<<<<<<<<<
+ *     cvcenter.y = <float>center[1]
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     cdef np.ndarray out
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   #ifndef PYREX_WITHOUT_ASSERTIONS
   if (unlikely(!((__pyx_v_warpmat->dimensions[1]) == 3))) {
     PyErr_SetObject(PyExc_AssertionError, __pyx_kp_78);
@@ -4919,12 +6944,52 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":585
  *     cdef CvMat* cvmatptr
  * 
+=======
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_3 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 622; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_cvcenter.x = ((float)__pyx_t_3);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":623
+ *     cdef CvPoint2D32f cvcenter
+ *     cvcenter.x = <float>center[0]
+ *     cvcenter.y = <float>center[1]             # <<<<<<<<<<<<<<
+ * 
+ *     cdef np.ndarray out = new_array(src.ndim, shape, src.dtype)
+ */
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 623; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_3 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 623; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_cvcenter.y = ((float)__pyx_t_3);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":625
+ *     cvcenter.y = <float>center[1]
+ * 
+ *     cdef np.ndarray out = new_array(src.ndim, shape, src.dtype)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef IplImage srcimg
+ */
+  __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 625; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_src->nd, __pyx_v_shape, __pyx_t_4)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 625; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+  __pyx_v_out = ((PyArrayObject *)__pyx_t_5);
+  __pyx_t_5 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":629
+ *     cdef IplImage srcimg
+ *     cdef IplImage outimg
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
  *     populate_iplimage(out, &outimg)
  *     populate_iplimage(warpmat, &cvmat)
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":586
  * 
  *     populate_iplimage(src, &srcimg)
@@ -4936,10 +7001,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":587
  *     populate_iplimage(src, &srcimg)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":630
+ *     cdef IplImage outimg
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
+ * 
+ *     c_cvGetRectSubPix(&srcimg, &outimg, cvcenter)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":632
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(out, &outimg)
  *     populate_iplimage(warpmat, &cvmat)             # <<<<<<<<<<<<<<
  *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)
  * 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_warpmat, (&__pyx_v_cvmat));
 
@@ -4976,6 +7054,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP
  *     return out             # <<<<<<<<<<<<<<
  * 
  * def cvResize(np.ndarray src, height=None, width=None,
+=======
+ *     c_cvGetRectSubPix(&srcimg, &outimg, cvcenter)             # <<<<<<<<<<<<<<
+ * 
+ *     PyMem_Free(shape)
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGetRectSubPix((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cvcenter);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":634
+ *     c_cvGetRectSubPix(&srcimg, &outimg, cvcenter)
+ * 
+ *     PyMem_Free(shape)             # <<<<<<<<<<<<<<
+ * 
+ *     return out
+ */
+  PyMem_Free(__pyx_v_shape);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":636
+ *     PyMem_Free(shape)
+ * 
+ *     return out             # <<<<<<<<<<<<<<
+ * 
+ * def cvGetQuadrangleSubPix(np.ndarray src, np.ndarray warpmat, float_out=False):
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
   __Pyx_XDECREF(__pyx_r);
   __Pyx_INCREF(((PyObject *)__pyx_v_out));
@@ -4986,16 +7087,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubP
   goto __pyx_L0;
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_XDECREF(__pyx_t_2);
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvGetQuadrangleSubPix");
+=======
+  __Pyx_XDECREF(__pyx_t_4);
+  __Pyx_XDECREF(__pyx_t_5);
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvGetRectSubPix");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_r = NULL;
   __pyx_L0:;
-  __Pyx_DECREF((PyObject *)__pyx_v_out);
+  __Pyx_XDECREF((PyObject *)__pyx_v_out);
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_FinishRefcountContext();
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":596
  *     return out
  * 
@@ -5017,9 +7125,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject *
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg;
   PyObject *__pyx_r = NULL;
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":638
+ *     return out
+ * 
+ * def cvGetQuadrangleSubPix(np.ndarray src, np.ndarray warpmat, float_out=False):             # <<<<<<<<<<<<<<
+ *     ''' Retrieves the pixel quandrangle from an image with
+ *     sub-pixel accuracy. In english: apply and affine transform to an image.
+ */
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubPix(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static char __pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubPix[] = " Retrieves the pixel quandrangle from an image with\n    sub-pixel accuracy. In english: apply and affine transform to an image.\n\n    Parameters:\n                src - input image\n                warpmat - a 2x3 array which is an affine transform\n                float_out - return a float32 array. If true, input must be\n                            uint8. If false, output is same type as input.\n\n    Return:\n                warped image of same size and dtype as src. Except when\n                float_out == True (see above)\n    ";
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubPix(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+  PyArrayObject *__pyx_v_src = 0;
+  PyArrayObject *__pyx_v_warpmat = 0;
+  PyObject *__pyx_v_float_out = 0;
+  PyArrayObject *__pyx_v_out;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_cvmat;
+  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmatptr;
+  PyObject *__pyx_r = NULL;
+  PyObject *__pyx_1 = 0;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   int __pyx_t_1;
   int __pyx_t_2;
   int __pyx_t_3;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   int __pyx_t_4;
   PyObject *__pyx_t_5 = NULL;
   PyObject *__pyx_t_6 = NULL;
@@ -5034,6 +7166,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject *
     values[2] = Py_None;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
+=======
+  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_warpmat,&__pyx_kp_float_out,0};
+  __Pyx_SetupRefcountContext("cvGetQuadrangleSubPix");
+  __pyx_self = __pyx_self;
+  if (unlikely(__pyx_kwds)) {
+    Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+    PyObject* values[3] = {0,0,0};
+    values[2] = __pyx_k_121;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
       case  2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
       case  1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
@@ -5046,6 +7188,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject *
       if (likely(values[0])) kw_args--;
       else goto __pyx_L5_argtuple_error;
       case  1:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (kw_args > 0) {
         PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_height);
         if (unlikely(value)) { values[1] = value; kw_args--; }
@@ -5081,12 +7224,40 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject *
       case  3: __pyx_v_width = PyTuple_GET_ITEM(__pyx_args, 2);
       case  2: __pyx_v_height = PyTuple_GET_ITEM(__pyx_args, 1);
       case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+=======
+      values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_warpmat);
+      if (likely(values[1])) kw_args--;
+      else {
+        __Pyx_RaiseArgtupleInvalid("cvGetQuadrangleSubPix", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      }
+      case  2:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_float_out);
+        if (unlikely(value)) { values[2] = value; kw_args--; }
+      }
+    }
+    if (unlikely(kw_args > 0)) {
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvGetQuadrangleSubPix") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_warpmat = ((PyArrayObject *)values[1]);
+    __pyx_v_float_out = values[2];
+  } else {
+    __pyx_v_float_out = __pyx_k_121;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  3:
+      __pyx_v_float_out = PyTuple_GET_ITEM(__pyx_args, 2);
+      case  2:
+      __pyx_v_warpmat = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
+      __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       break;
       default: goto __pyx_L5_argtuple_error;
     }
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvResize", 0, 1, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 596; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvResize");
@@ -5164,8 +7335,90 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject *
  *     cdef np.npy_intp* shape = clone_array_shape(src)
  *     shape[0] = height             # <<<<<<<<<<<<<<
  *     shape[1] = width
+=======
+  __Pyx_RaiseArgtupleInvalid("cvGetQuadrangleSubPix", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvGetQuadrangleSubPix");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+  __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_warpmat), __pyx_ptype_5numpy_ndarray, 1, "warpmat", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":652
+ *                 float_out == True (see above)
+ *     '''
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+ *     validate_array(warpmat)
  * 
  */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 652; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":653
+ *     '''
+ *     validate_array(src)
+ *     validate_array(warpmat)             # <<<<<<<<<<<<<<
+ * 
+ *     assert_nchannels(src, [1, 3])
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_warpmat); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":655
+ *     validate_array(warpmat)
+ * 
+ *     assert_nchannels(src, [1, 3])             # <<<<<<<<<<<<<<
+ * 
+ *     assert_nchannels(warpmat, [1])
+ */
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 655; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 655; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":657
+ *     assert_nchannels(src, [1, 3])
+ * 
+ *     assert_nchannels(warpmat, [1])             # <<<<<<<<<<<<<<
+ * 
+ *     assert warpmat.shape[0] == 2, 'warpmat must be 2x3'
+ */
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 657; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_warpmat, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 657; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":659
+ *     assert_nchannels(warpmat, [1])
+ * 
+ *     assert warpmat.shape[0] == 2, 'warpmat must be 2x3'             # <<<<<<<<<<<<<<
+ *     assert warpmat.shape[1] == 3, 'warpmat must be 2x3'
+ * 
+ */
+  #ifndef PYREX_WITHOUT_ASSERTIONS
+  if (unlikely(!((__pyx_v_warpmat->dimensions[0]) == 2))) {
+    PyErr_SetObject(PyExc_AssertionError, __pyx_kp_150);
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 659; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  }
+  #endif
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":660
+ * 
+ *     assert warpmat.shape[0] == 2, 'warpmat must be 2x3'
+ *     assert warpmat.shape[1] == 3, 'warpmat must be 2x3'             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     cdef np.ndarray out
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_7 = __Pyx_PyInt_from_py_npy_intp(__pyx_v_height); if (unlikely((__pyx_t_7 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 610; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   (__pyx_v_shape[0]) = __pyx_t_7;
 
@@ -5184,8 +7437,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject *
  * 
  *     cdef np.ndarray out = new_array(ndim, shape, src.dtype)             # <<<<<<<<<<<<<<
  *     validate_array(out)
+=======
+  #ifndef PYREX_WITHOUT_ASSERTIONS
+  if (unlikely(!((__pyx_v_warpmat->dimensions[1]) == 3))) {
+    PyErr_SetObject(PyExc_AssertionError, __pyx_kp_151);
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 660; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  }
+  #endif
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":664
+ *     cdef np.ndarray out
  * 
+ *     if float_out:             # <<<<<<<<<<<<<<
+ *         assert_dtype(src, [UINT8])
+ *         out = new_array_like_diff_dtype(src, FLOAT32)
  */
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_float_out); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 664; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_3) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":665
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     if float_out:
+ *         assert_dtype(src, [UINT8])             # <<<<<<<<<<<<<<
+ *         out = new_array_like_diff_dtype(src, FLOAT32)
+ *     else:
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_6 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 613; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_6);
   __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_ndim, __pyx_v_shape, __pyx_t_6)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 613; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -5245,6 +7523,112 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject *
  *     return out             # <<<<<<<<<<<<<<
  * 
  * def cvWarpAffine(np.ndarray src, np.ndarray warpmat,
+=======
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+    PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
+    __Pyx_GIVEREF(__pyx_1);
+    __pyx_1 = 0;
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 665; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":666
+ *     if float_out:
+ *         assert_dtype(src, [UINT8])
+ *         out = new_array_like_diff_dtype(src, FLOAT32)             # <<<<<<<<<<<<<<
+ *     else:
+ *         out = new_array_like(src)
+ */
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 666; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __Pyx_DECREF(((PyObject *)__pyx_v_out));
+    __pyx_v_out = ((PyArrayObject *)__pyx_t_2);
+    __pyx_t_2 = 0;
+    goto __pyx_L6;
+  }
+  /*else*/ {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":668
+ *         out = new_array_like_diff_dtype(src, FLOAT32)
+ *     else:
+ *         out = new_array_like(src)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef IplImage srcimg
+ */
+    __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 668; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(((PyObject *)__pyx_v_out));
+    __pyx_v_out = ((PyArrayObject *)__pyx_t_2);
+    __pyx_t_2 = 0;
+  }
+  __pyx_L6:;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":675
+ *     cdef CvMat* cvmatptr
+ * 
+ *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(out, &outimg)
+ *     populate_iplimage(warpmat, &cvmat)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":676
+ * 
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(warpmat, &cvmat)
+ *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":677
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)
+ *     populate_iplimage(warpmat, &cvmat)             # <<<<<<<<<<<<<<
+ *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)
+ * 
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_warpmat, (&__pyx_v_cvmat));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":678
+ *     populate_iplimage(out, &outimg)
+ *     populate_iplimage(warpmat, &cvmat)
+ *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)             # <<<<<<<<<<<<<<
+ * 
+ *     c_cvGetQuadrangleSubPix(&srcimg, &outimg, cvmatptr)
+ */
+  __pyx_v_cvmatptr = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_cvmat));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":680
+ *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)
+ * 
+ *     c_cvGetQuadrangleSubPix(&srcimg, &outimg, cvmatptr)             # <<<<<<<<<<<<<<
+ * 
+ *     PyMem_Free(cvmatptr)
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGetQuadrangleSubPix((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cvmatptr);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":682
+ *     c_cvGetQuadrangleSubPix(&srcimg, &outimg, cvmatptr)
+ * 
+ *     PyMem_Free(cvmatptr)             # <<<<<<<<<<<<<<
+ * 
+ *     return out
+ */
+  PyMem_Free(__pyx_v_cvmatptr);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":684
+ *     PyMem_Free(cvmatptr)
+ * 
+ *     return out             # <<<<<<<<<<<<<<
+ * 
+ * def cvResize(np.ndarray src, height=None, width=None,
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
   __Pyx_XDECREF(__pyx_r);
   __Pyx_INCREF(((PyObject *)__pyx_v_out));
@@ -5254,17 +7638,27 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject *
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_XDECREF(__pyx_t_5);
   __Pyx_XDECREF(__pyx_t_6);
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvResize");
   __pyx_r = NULL;
   __pyx_L0:;
   __Pyx_XDECREF((PyObject *)__pyx_v_out);
+=======
+  __Pyx_XDECREF(__pyx_1);
+  __Pyx_XDECREF(__pyx_t_2);
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvGetQuadrangleSubPix");
+  __pyx_r = NULL;
+  __pyx_L0:;
+  __Pyx_DECREF((PyObject *)__pyx_v_out);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_FinishRefcountContext();
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":627
  *     return out
  * 
@@ -5283,23 +7677,58 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
   PyArrayObject *__pyx_v_out;
   struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvScalar __pyx_v_cvfill;
   int __pyx_v_i;
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":686
+ *     return out
+ * 
+ * def cvResize(np.ndarray src, height=None, width=None,             # <<<<<<<<<<<<<<
+ *              int method=CV_INTER_LINEAR):
+ *     """
+ */
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static char __pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvResize[] = "\n    better doc string needed.\n    for now:\n    http://opencv.willowgarage.com/documentation/cvreference.html\n    ";
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+  PyArrayObject *__pyx_v_src = 0;
+  PyObject *__pyx_v_height = 0;
+  PyObject *__pyx_v_width = 0;
+  int __pyx_v_method;
+  int __pyx_v_ndim;
+  npy_intp *__pyx_v_shape;
+  PyArrayObject *__pyx_v_out = 0;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_cvmat;
   struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmatptr;
   PyObject *__pyx_r = NULL;
-  PyObject *__pyx_1 = 0;
   int __pyx_t_1;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   Py_ssize_t __pyx_t_2;
   PyObject *__pyx_t_3 = NULL;
   double __pyx_t_4;
   static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_warpmat,&__pyx_kp_flags,&__pyx_kp_fillval,0};
   __Pyx_SetupRefcountContext("cvWarpAffine");
+=======
+  int __pyx_t_2;
+  int __pyx_t_3;
+  int __pyx_t_4;
+  PyObject *__pyx_t_5 = NULL;
+  PyObject *__pyx_t_6 = NULL;
+  npy_intp __pyx_t_7;
+  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_height,&__pyx_kp_width,&__pyx_kp_method,0};
+  __Pyx_SetupRefcountContext("cvResize");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_self = __pyx_self;
   if (unlikely(__pyx_kwds)) {
     Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
     PyObject* values[4] = {0,0,0,0};
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     values[3] = __pyx_k_50;
+=======
+    values[1] = Py_None;
+    values[2] = Py_None;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
       case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
@@ -5314,6 +7743,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
       if (likely(values[0])) kw_args--;
       else goto __pyx_L5_argtuple_error;
       case  1:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_warpmat);
       if (likely(values[1])) kw_args--;
       else {
@@ -5322,15 +7752,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
       case  2:
       if (kw_args > 0) {
         PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_flags);
+=======
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_height);
+        if (unlikely(value)) { values[1] = value; kw_args--; }
+      }
+      case  2:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_width);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
         if (unlikely(value)) { values[2] = value; kw_args--; }
       }
       case  3:
       if (kw_args > 0) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
         PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_fillval);
+=======
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_method);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
         if (unlikely(value)) { values[3] = value; kw_args--; }
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvWarpAffine") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 627; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
@@ -5352,12 +7796,34 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
       case  2:
       __pyx_v_warpmat = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
       __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvResize") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_height = values[1];
+    __pyx_v_width = values[2];
+    if (values[3]) {
+      __pyx_v_method = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_method == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 687; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_method = __pyx_k_122;
+    }
+  } else {
+    __pyx_v_height = Py_None;
+    __pyx_v_width = Py_None;
+    __pyx_v_method = __pyx_k_122;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  4: __pyx_v_method = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_method == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 687; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  3: __pyx_v_width = PyTuple_GET_ITEM(__pyx_args, 2);
+      case  2: __pyx_v_height = PyTuple_GET_ITEM(__pyx_args, 1);
+      case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       break;
       default: goto __pyx_L5_argtuple_error;
     }
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvWarpAffine", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 627; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvWarpAffine");
@@ -5382,9 +7848,81 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
  *     validate_array(warpmat)             # <<<<<<<<<<<<<<
  *     assert len(fillval) == 4, 'fillval must be a 4-tuple'
  *     assert_nchannels(src, [1, 3])
+=======
+  __Pyx_RaiseArgtupleInvalid("cvResize", 0, 1, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvResize");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 686; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":693
+ *     http://opencv.willowgarage.com/documentation/cvreference.html
+ *     """
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+ * 
+ *     if not height or not width:
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 693; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":695
+ *     validate_array(src)
+ * 
+ *     if not height or not width:             # <<<<<<<<<<<<<<
+ *         raise ValueError('width and height must not be none')
+ * 
+ */
+  __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_v_height); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (!(!__pyx_t_2)) {
+    __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_width); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_4 = (!__pyx_t_3);
+  } else {
+    __pyx_t_4 = (!__pyx_t_2);
+  }
+  if (__pyx_t_4) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":696
+ * 
+ *     if not height or not width:
+ *         raise ValueError('width and height must not be none')             # <<<<<<<<<<<<<<
+ * 
+ *     cdef int ndim = src.ndim
+ */
+    __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_5));
+    __Pyx_INCREF(__pyx_kp_152);
+    PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_152);
+    __Pyx_GIVEREF(__pyx_kp_152);
+    __pyx_t_6 = PyObject_Call(__pyx_builtin_ValueError, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_6);
+    __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+    __Pyx_Raise(__pyx_t_6, 0, 0);
+    __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    goto __pyx_L6;
+  }
+  __pyx_L6:;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":698
+ *         raise ValueError('width and height must not be none')
+ * 
+ *     cdef int ndim = src.ndim             # <<<<<<<<<<<<<<
+ *     cdef np.npy_intp* shape = clone_array_shape(src)
+ *     shape[0] = height
+ */
+  __pyx_v_ndim = __pyx_v_src->nd;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":699
+ * 
+ *     cdef int ndim = src.ndim
+ *     cdef np.npy_intp* shape = clone_array_shape(src)             # <<<<<<<<<<<<<<
+ *     shape[0] = height
+ *     shape[1] = width
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_warpmat); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 645; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":646
  *     validate_array(src)
  *     validate_array(warpmat)
@@ -5465,9 +8003,37 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
  * 
  *     cdef np.ndarray out
  *     out = new_array_like(src)             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":700
+ *     cdef int ndim = src.ndim
+ *     cdef np.npy_intp* shape = clone_array_shape(src)
+ *     shape[0] = height             # <<<<<<<<<<<<<<
+ *     shape[1] = width
+ * 
+ */
+  __pyx_t_7 = __Pyx_PyInt_from_py_npy_intp(__pyx_v_height); if (unlikely((__pyx_t_7 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 700; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  (__pyx_v_shape[0]) = __pyx_t_7;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":701
+ *     cdef np.npy_intp* shape = clone_array_shape(src)
+ *     shape[0] = height
+ *     shape[1] = width             # <<<<<<<<<<<<<<
+ * 
+ *     cdef np.ndarray out = new_array(ndim, shape, src.dtype)
+ */
+  __pyx_t_7 = __Pyx_PyInt_from_py_npy_intp(__pyx_v_width); if (unlikely((__pyx_t_7 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 701; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  (__pyx_v_shape[1]) = __pyx_t_7;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":703
+ *     shape[1] = width
+ * 
+ *     cdef np.ndarray out = new_array(ndim, shape, src.dtype)             # <<<<<<<<<<<<<<
+ *     validate_array(out)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     cdef CvScalar cvfill
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 653; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(((PyObject *)__pyx_v_out));
@@ -5501,12 +8067,44 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":665
  *     cdef CvMat* cvmatptr
  * 
+=======
+  __pyx_t_6 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 703; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_6);
+  __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_ndim, __pyx_v_shape, __pyx_t_6)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 703; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
+  __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0;
+  __pyx_v_out = ((PyArrayObject *)__pyx_t_5);
+  __pyx_t_5 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":704
+ * 
+ *     cdef np.ndarray out = new_array(ndim, shape, src.dtype)
+ *     validate_array(out)             # <<<<<<<<<<<<<<
+ * 
+ *     PyMem_Free(shape)
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 704; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":706
+ *     validate_array(out)
+ * 
+ *     PyMem_Free(shape)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef IplImage srcimg
+ */
+  PyMem_Free(__pyx_v_shape);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":710
+ *     cdef IplImage srcimg
+ *     cdef IplImage outimg
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
  *     populate_iplimage(out, &outimg)
  *     populate_iplimage(warpmat, &cvmat)
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":666
  * 
  *     populate_iplimage(src, &srcimg)
@@ -5518,10 +8116,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":667
  *     populate_iplimage(src, &srcimg)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":711
+ *     cdef IplImage outimg
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
+ * 
+ *     c_cvResize(&srcimg, &outimg, method)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":713
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(out, &outimg)
  *     populate_iplimage(warpmat, &cvmat)             # <<<<<<<<<<<<<<
  *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)
  * 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_warpmat, (&__pyx_v_cvmat));
 
@@ -5558,6 +8169,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
  *     return out             # <<<<<<<<<<<<<<
  * 
  * def cvWarpPerspective(np.ndarray src, np.ndarray warpmat,
+=======
+ *     c_cvResize(&srcimg, &outimg, method)             # <<<<<<<<<<<<<<
+ * 
+ *     return out
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvResize((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_method);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":715
+ *     c_cvResize(&srcimg, &outimg, method)
+ * 
+ *     return out             # <<<<<<<<<<<<<<
+ * 
+ * def cvWarpAffine(np.ndarray src, np.ndarray warpmat,
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
   __Pyx_XDECREF(__pyx_r);
   __Pyx_INCREF(((PyObject *)__pyx_v_out));
@@ -5567,9 +8192,15 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_XDECREF(__pyx_1);
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvWarpAffine");
+=======
+  __Pyx_XDECREF(__pyx_t_5);
+  __Pyx_XDECREF(__pyx_t_6);
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvResize");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_r = NULL;
   __pyx_L0:;
   __Pyx_DECREF((PyObject *)__pyx_v_out);
@@ -5578,6 +8209,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":676
  *     return out
  * 
@@ -5589,6 +8221,19 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObje
 static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static char __pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective[] = " Applies a perspective transformation to an image.\n\n    Parameters:\n                src - source image\n                warpmat - 3x3 perspective transformation\n                flags - a combination of interpolation and method flags.\n                        see opencv documentation for more details\n                fillval - a 4 tuple of a color to fill the background\n                          defaults to black.\n\n    Returns:\n                a warped image the same size and dtype as src\n    ";
 static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":717
+ *     return out
+ * 
+ * def cvWarpAffine(np.ndarray src, np.ndarray warpmat,             # <<<<<<<<<<<<<<
+ *                  int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS,
+ *                  fillval=(0., 0., 0., 0.)):
+ */
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static char __pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine[] = " Applies an affine transformation to an image.\n\n    Parameters:\n                src - source image\n                warpmat - 2x3 affine transformation\n                flags - a combination of interpolation and method flags.\n                        see opencv documentation for more details\n                fillval - a 4 tuple of a color to fill the background\n                          defaults to black.\n\n    Returns:\n                a warped image the same size and dtype as src\n    ";
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   PyArrayObject *__pyx_v_src = 0;
   PyArrayObject *__pyx_v_warpmat = 0;
   int __pyx_v_flags;
@@ -5607,12 +8252,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
   PyObject *__pyx_t_3 = NULL;
   double __pyx_t_4;
   static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_warpmat,&__pyx_kp_flags,&__pyx_kp_fillval,0};
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_SetupRefcountContext("cvWarpPerspective");
+=======
+  __Pyx_SetupRefcountContext("cvWarpAffine");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_self = __pyx_self;
   if (unlikely(__pyx_kwds)) {
     Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
     PyObject* values[4] = {0,0,0,0};
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     values[3] = __pyx_k_52;
+=======
+    values[3] = __pyx_k_125;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
       case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
@@ -5630,7 +8283,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
       values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_warpmat);
       if (likely(values[1])) kw_args--;
       else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
         __Pyx_RaiseArgtupleInvalid("cvWarpPerspective", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 676; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+        __Pyx_RaiseArgtupleInvalid("cvWarpAffine", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       }
       case  2:
       if (kw_args > 0) {
@@ -5644,11 +8301,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvWarpPerspective") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 676; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvWarpAffine") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     __pyx_v_warpmat = ((PyArrayObject *)values[1]);
     if (values[2]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_flags = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     } else {
       __pyx_v_flags = __pyx_k_51;
@@ -5657,11 +8319,25 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
   } else {
     __pyx_v_flags = __pyx_k_51;
     __pyx_v_fillval = __pyx_k_52;
+=======
+      __pyx_v_flags = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_flags = __pyx_k_124;
+    }
+    __pyx_v_fillval = values[3];
+  } else {
+    __pyx_v_flags = __pyx_k_124;
+    __pyx_v_fillval = __pyx_k_125;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  4:
       __pyx_v_fillval = PyTuple_GET_ITEM(__pyx_args, 3);
       case  3:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_flags = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_flags = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  2:
       __pyx_v_warpmat = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
       __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
@@ -5671,6 +8347,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvWarpPerspective", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 676; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvWarpPerspective");
@@ -5681,24 +8358,48 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_warpmat), __pyx_ptype_5numpy_ndarray, 1, "warpmat", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 676; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":693
+=======
+  __Pyx_RaiseArgtupleInvalid("cvWarpAffine", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvWarpAffine");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+  __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_warpmat), __pyx_ptype_5numpy_ndarray, 1, "warpmat", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 717; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":734
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *                 a warped image the same size and dtype as src
  *     '''
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     validate_array(warpmat)
  *     assert len(fillval) == 4, 'fillval must be a 4-tuple'
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 693; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":694
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 734; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":735
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     '''
  *     validate_array(src)
  *     validate_array(warpmat)             # <<<<<<<<<<<<<<
  *     assert len(fillval) == 4, 'fillval must be a 4-tuple'
  *     assert_nchannels(src, [1, 3])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_warpmat); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 694; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":695
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_warpmat); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 735; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":736
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     validate_array(src)
  *     validate_array(warpmat)
  *     assert len(fillval) == 4, 'fillval must be a 4-tuple'             # <<<<<<<<<<<<<<
@@ -5706,6 +8407,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
  *     assert_nchannels(warpmat, [1])
  */
   #ifndef PYREX_WITHOUT_ASSERTIONS
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyObject_Length(__pyx_v_fillval); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 695; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!(__pyx_t_2 == 4))) {
     PyErr_SetObject(PyExc_AssertionError, __pyx_kp_83);
@@ -5714,13 +8416,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
   #endif
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":696
+=======
+  __pyx_t_2 = PyObject_Length(__pyx_v_fillval); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 736; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!(__pyx_t_2 == 4))) {
+    PyErr_SetObject(PyExc_AssertionError, __pyx_kp_153);
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 736; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  }
+  #endif
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":737
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     validate_array(warpmat)
  *     assert len(fillval) == 4, 'fillval must be a 4-tuple'
  *     assert_nchannels(src, [1, 3])             # <<<<<<<<<<<<<<
  *     assert_nchannels(warpmat, [1])
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  *     assert warpmat.shape[0] == 3, 'warpmat must be 3x3'
  */
   __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+ *     assert warpmat.shape[0] == 2, 'warpmat must be 2x3'
+ */
+  __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 737; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_3));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_1);
@@ -5728,6 +8446,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
   __Pyx_INCREF(__pyx_int_3);
   PyList_SET_ITEM(__pyx_t_3, 1, __pyx_int_3);
   __Pyx_GIVEREF(__pyx_int_3);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 696; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
 
@@ -5739,10 +8458,24 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
  *     assert warpmat.shape[1] == 3, 'warpmat must be 3x3'
  */
   __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 737; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":738
+ *     assert len(fillval) == 4, 'fillval must be a 4-tuple'
+ *     assert_nchannels(src, [1, 3])
+ *     assert_nchannels(warpmat, [1])             # <<<<<<<<<<<<<<
+ *     assert warpmat.shape[0] == 2, 'warpmat must be 2x3'
+ *     assert warpmat.shape[1] == 3, 'warpmat must be 2x3'
+ */
+  __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_3));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_1);
   __Pyx_GIVEREF(__pyx_int_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_warpmat, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 697; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
 
@@ -5764,35 +8497,76 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
  *     assert_nchannels(warpmat, [1])
  *     assert warpmat.shape[0] == 3, 'warpmat must be 3x3'
  *     assert warpmat.shape[1] == 3, 'warpmat must be 3x3'             # <<<<<<<<<<<<<<
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_warpmat, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 738; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":739
+ *     assert_nchannels(src, [1, 3])
+ *     assert_nchannels(warpmat, [1])
+ *     assert warpmat.shape[0] == 2, 'warpmat must be 2x3'             # <<<<<<<<<<<<<<
+ *     assert warpmat.shape[1] == 3, 'warpmat must be 2x3'
+ * 
+ */
+  #ifndef PYREX_WITHOUT_ASSERTIONS
+  if (unlikely(!((__pyx_v_warpmat->dimensions[0]) == 2))) {
+    PyErr_SetObject(PyExc_AssertionError, __pyx_kp_154);
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 739; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  }
+  #endif
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":740
+ *     assert_nchannels(warpmat, [1])
+ *     assert warpmat.shape[0] == 2, 'warpmat must be 2x3'
+ *     assert warpmat.shape[1] == 3, 'warpmat must be 2x3'             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     cdef np.ndarray out
  */
   #ifndef PYREX_WITHOUT_ASSERTIONS
   if (unlikely(!((__pyx_v_warpmat->dimensions[1]) == 3))) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     PyErr_SetObject(PyExc_AssertionError, __pyx_kp_85);
     {__pyx_filename = __pyx_f[0]; __pyx_lineno = 699; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   }
   #endif
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":702
+=======
+    PyErr_SetObject(PyExc_AssertionError, __pyx_kp_155);
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 740; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  }
+  #endif
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":743
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     cdef np.ndarray out
  *     out = new_array_like(src)             # <<<<<<<<<<<<<<
  * 
  *     cdef CvScalar cvfill
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 702; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 743; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(((PyObject *)__pyx_v_out));
   __pyx_v_out = ((PyArrayObject *)__pyx_t_3);
   __pyx_t_3 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":706
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":747
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef CvScalar cvfill
  *     cdef int i
  *     for i in range(4):             # <<<<<<<<<<<<<<
  *         cvfill.val[i] = <double>fillval[i]
  * 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  */
   for (__pyx_t_1 = 0; __pyx_t_1 < 4; __pyx_t_1+=1) {
     __pyx_v_i = __pyx_t_1;
@@ -5815,13 +8589,35 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
  *     cdef IplImage outimg
  *     cdef IplImage cvmat
  *     cdef CvMat* cvmatptr = NULL             # <<<<<<<<<<<<<<
+=======
+ */
+  for (__pyx_t_1 = 0; __pyx_t_1 < 4; __pyx_t_1+=1) {
+    __pyx_v_i = __pyx_t_1;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":748
+ *     cdef int i
+ *     for i in range(4):
+ *         cvfill.val[i] = <double>fillval[i]             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     populate_iplimage(src, &srcimg)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_v_cvmatptr = NULL;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":714
  *     cdef CvMat* cvmatptr = NULL
+=======
+    __pyx_1 = __Pyx_GetItemInt(__pyx_v_fillval, __pyx_v_i, sizeof(int), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 748; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 748; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    (__pyx_v_cvfill.val[__pyx_v_i]) = ((double)__pyx_t_4);
+  }
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":755
+ *     cdef CvMat* cvmatptr
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
  *     populate_iplimage(out, &outimg)
@@ -5829,7 +8625,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":715
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":756
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     populate_iplimage(src, &srcimg)
  *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
@@ -5838,7 +8638,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":716
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":757
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(src, &srcimg)
  *     populate_iplimage(out, &outimg)
  *     populate_iplimage(warpmat, &cvmat)             # <<<<<<<<<<<<<<
@@ -5847,12 +8651,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_warpmat, (&__pyx_v_cvmat));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":717
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":758
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     populate_iplimage(out, &outimg)
  *     populate_iplimage(warpmat, &cvmat)
  *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)             # <<<<<<<<<<<<<<
  *     c_cvWarpPerspective(&srcimg, &outimg, cvmatptr, flags, cvfill)
  * 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  */
   __pyx_v_cvmatptr = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_cvmat));
 
@@ -5867,6 +8676,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":720
  *     c_cvWarpPerspective(&srcimg, &outimg, cvmatptr, flags, cvfill)
+=======
+ *     c_cvWarpAffine(&srcimg, &outimg, cvmatptr, flags, cvfill)
+ */
+  __pyx_v_cvmatptr = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_cvmat));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":760
+ *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)
+ * 
+ *     c_cvWarpAffine(&srcimg, &outimg, cvmatptr, flags, cvfill)             # <<<<<<<<<<<<<<
+ * 
+ *     PyMem_Free(cvmatptr)
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvWarpAffine((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cvmatptr, __pyx_v_flags, __pyx_v_cvfill);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":762
+ *     c_cvWarpAffine(&srcimg, &outimg, cvmatptr, flags, cvfill)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     PyMem_Free(cvmatptr)             # <<<<<<<<<<<<<<
  * 
@@ -5874,12 +8700,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
  */
   PyMem_Free(__pyx_v_cvmatptr);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":722
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":764
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     PyMem_Free(cvmatptr)
  * 
  *     return out             # <<<<<<<<<<<<<<
  * 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  * def cvLogPolar(np.ndarray src, center, double M,
+=======
+ * def cvWarpPerspective(np.ndarray src, np.ndarray warpmat,
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
   __Pyx_XDECREF(__pyx_r);
   __Pyx_INCREF(((PyObject *)__pyx_v_out));
@@ -5891,7 +8725,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_1);
   __Pyx_XDECREF(__pyx_t_3);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvWarpPerspective");
+=======
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvWarpAffine");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_r = NULL;
   __pyx_L0:;
   __Pyx_DECREF((PyObject *)__pyx_v_out);
@@ -5900,6 +8738,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(P
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":724
  *     return out
  * 
@@ -5916,20 +8755,52 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject
   int __pyx_v_flags;
   PyArrayObject *__pyx_v_out = 0;
   struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f __pyx_v_cv_center;
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":766
+ *     return out
+ * 
+ * def cvWarpPerspective(np.ndarray src, np.ndarray warpmat,             # <<<<<<<<<<<<<<
+ *                       int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS,
+ *                       fillval=(0., 0., 0., 0.)):
+ */
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static char __pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective[] = " Applies a perspective transformation to an image.\n\n    Parameters:\n                src - source image\n                warpmat - 3x3 perspective transformation\n                flags - a combination of interpolation and method flags.\n                        see opencv documentation for more details\n                fillval - a 4 tuple of a color to fill the background\n                          defaults to black.\n\n    Returns:\n                a warped image the same size and dtype as src\n    ";
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+  PyArrayObject *__pyx_v_src = 0;
+  PyArrayObject *__pyx_v_warpmat = 0;
+  int __pyx_v_flags;
+  PyObject *__pyx_v_fillval = 0;
+  PyArrayObject *__pyx_v_out;
+  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvScalar __pyx_v_cvfill;
+  int __pyx_v_i;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_cvmat;
+  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmatptr;
   PyObject *__pyx_r = NULL;
   PyObject *__pyx_1 = 0;
   int __pyx_t_1;
   Py_ssize_t __pyx_t_2;
   PyObject *__pyx_t_3 = NULL;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   float __pyx_t_4;
   static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_center,&__pyx_kp_M,&__pyx_kp_flags,0};
   __Pyx_SetupRefcountContext("cvLogPolar");
+=======
+  double __pyx_t_4;
+  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_warpmat,&__pyx_kp_flags,&__pyx_kp_fillval,0};
+  __Pyx_SetupRefcountContext("cvWarpPerspective");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_self = __pyx_self;
   if (unlikely(__pyx_kwds)) {
     Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
     PyObject* values[4] = {0,0,0,0};
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+=======
+    values[3] = __pyx_k_127;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
       case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
@@ -5944,6 +8815,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject
       if (likely(values[0])) kw_args--;
       else goto __pyx_L5_argtuple_error;
       case  1:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_center);
       if (likely(values[1])) kw_args--;
       else {
@@ -5958,10 +8830,26 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject
       case  3:
       if (kw_args > 0) {
         PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_flags);
+=======
+      values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_warpmat);
+      if (likely(values[1])) kw_args--;
+      else {
+        __Pyx_RaiseArgtupleInvalid("cvWarpPerspective", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      }
+      case  2:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_flags);
+        if (unlikely(value)) { values[2] = value; kw_args--; }
+      }
+      case  3:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_fillval);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
         if (unlikely(value)) { values[3] = value; kw_args--; }
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvLogPolar") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 724; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
@@ -5980,10 +8868,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject
       case  3:
       __pyx_v_M = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 724; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       __pyx_v_center = PyTuple_GET_ITEM(__pyx_args, 1);
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvWarpPerspective") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_warpmat = ((PyArrayObject *)values[1]);
+    if (values[2]) {
+      __pyx_v_flags = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_flags = __pyx_k_126;
+    }
+    __pyx_v_fillval = values[3];
+  } else {
+    __pyx_v_flags = __pyx_k_126;
+    __pyx_v_fillval = __pyx_k_127;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  4:
+      __pyx_v_fillval = PyTuple_GET_ITEM(__pyx_args, 3);
+      case  3:
+      __pyx_v_flags = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  2:
+      __pyx_v_warpmat = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
       break;
       default: goto __pyx_L5_argtuple_error;
     }
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
@@ -6058,13 +8969,170 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":738
  *     cdef IplImage srcimg
+=======
+  }
+  goto __pyx_L4_argument_unpacking_done;
+  __pyx_L5_argtuple_error:;
+  __Pyx_RaiseArgtupleInvalid("cvWarpPerspective", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvWarpPerspective");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+  __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_warpmat), __pyx_ptype_5numpy_ndarray, 1, "warpmat", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 766; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":783
+ *                 a warped image the same size and dtype as src
+ *     '''
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+ *     validate_array(warpmat)
+ *     assert len(fillval) == 4, 'fillval must be a 4-tuple'
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 783; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":784
+ *     '''
+ *     validate_array(src)
+ *     validate_array(warpmat)             # <<<<<<<<<<<<<<
+ *     assert len(fillval) == 4, 'fillval must be a 4-tuple'
+ *     assert_nchannels(src, [1, 3])
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_warpmat); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 784; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":785
+ *     validate_array(src)
+ *     validate_array(warpmat)
+ *     assert len(fillval) == 4, 'fillval must be a 4-tuple'             # <<<<<<<<<<<<<<
+ *     assert_nchannels(src, [1, 3])
+ *     assert_nchannels(warpmat, [1])
+ */
+  #ifndef PYREX_WITHOUT_ASSERTIONS
+  __pyx_t_2 = PyObject_Length(__pyx_v_fillval); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!(__pyx_t_2 == 4))) {
+    PyErr_SetObject(PyExc_AssertionError, __pyx_kp_156);
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 785; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  }
+  #endif
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":786
+ *     validate_array(warpmat)
+ *     assert len(fillval) == 4, 'fillval must be a 4-tuple'
+ *     assert_nchannels(src, [1, 3])             # <<<<<<<<<<<<<<
+ *     assert_nchannels(warpmat, [1])
+ *     assert warpmat.shape[0] == 3, 'warpmat must be 3x3'
+ */
+  __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_3, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 786; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":787
+ *     assert len(fillval) == 4, 'fillval must be a 4-tuple'
+ *     assert_nchannels(src, [1, 3])
+ *     assert_nchannels(warpmat, [1])             # <<<<<<<<<<<<<<
+ *     assert warpmat.shape[0] == 3, 'warpmat must be 3x3'
+ *     assert warpmat.shape[1] == 3, 'warpmat must be 3x3'
+ */
+  __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_warpmat, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 787; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":788
+ *     assert_nchannels(src, [1, 3])
+ *     assert_nchannels(warpmat, [1])
+ *     assert warpmat.shape[0] == 3, 'warpmat must be 3x3'             # <<<<<<<<<<<<<<
+ *     assert warpmat.shape[1] == 3, 'warpmat must be 3x3'
+ * 
+ */
+  #ifndef PYREX_WITHOUT_ASSERTIONS
+  if (unlikely(!((__pyx_v_warpmat->dimensions[0]) == 3))) {
+    PyErr_SetObject(PyExc_AssertionError, __pyx_kp_157);
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 788; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  }
+  #endif
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":789
+ *     assert_nchannels(warpmat, [1])
+ *     assert warpmat.shape[0] == 3, 'warpmat must be 3x3'
+ *     assert warpmat.shape[1] == 3, 'warpmat must be 3x3'             # <<<<<<<<<<<<<<
+ * 
+ *     cdef np.ndarray out
+ */
+  #ifndef PYREX_WITHOUT_ASSERTIONS
+  if (unlikely(!((__pyx_v_warpmat->dimensions[1]) == 3))) {
+    PyErr_SetObject(PyExc_AssertionError, __pyx_kp_158);
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 789; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  }
+  #endif
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":792
+ * 
+ *     cdef np.ndarray out
+ *     out = new_array_like(src)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef CvScalar cvfill
+ */
+  __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(((PyObject *)__pyx_v_out));
+  __pyx_v_out = ((PyArrayObject *)__pyx_t_3);
+  __pyx_t_3 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":796
+ *     cdef CvScalar cvfill
+ *     cdef int i
+ *     for i in range(4):             # <<<<<<<<<<<<<<
+ *         cvfill.val[i] = <double>fillval[i]
+ * 
+ */
+  for (__pyx_t_1 = 0; __pyx_t_1 < 4; __pyx_t_1+=1) {
+    __pyx_v_i = __pyx_t_1;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":797
+ *     cdef int i
+ *     for i in range(4):
+ *         cvfill.val[i] = <double>fillval[i]             # <<<<<<<<<<<<<<
+ * 
+ *     cdef IplImage srcimg
+ */
+    __pyx_1 = __Pyx_GetItemInt(__pyx_v_fillval, __pyx_v_i, sizeof(int), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 797; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    (__pyx_v_cvfill.val[__pyx_v_i]) = ((double)__pyx_t_4);
+  }
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":802
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage outimg
+ *     cdef IplImage cvmat
+ *     cdef CvMat* cvmatptr = NULL             # <<<<<<<<<<<<<<
+ * 
+ *     populate_iplimage(src, &srcimg)
+ */
+  __pyx_v_cvmatptr = NULL;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":804
+ *     cdef CvMat* cvmatptr = NULL
+ * 
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
  *     populate_iplimage(out, &outimg)
- * 
+ *     populate_iplimage(warpmat, &cvmat)
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":739
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)
@@ -6075,20 +9143,75 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":741
- *     populate_iplimage(out, &outimg)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":805
  * 
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(warpmat, &cvmat)
+ *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":806
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)
+ *     populate_iplimage(warpmat, &cvmat)             # <<<<<<<<<<<<<<
+ *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)
+ *     c_cvWarpPerspective(&srcimg, &outimg, cvmatptr, flags, cvfill)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_warpmat, (&__pyx_v_cvmat));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":807
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ *     populate_iplimage(out, &outimg)
+ *     populate_iplimage(warpmat, &cvmat)
+ *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)             # <<<<<<<<<<<<<<
+ *     c_cvWarpPerspective(&srcimg, &outimg, cvmatptr, flags, cvfill)
+ * 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  *     c_cvLogPolar(&srcimg, &outimg, cv_center, M, flags)             # <<<<<<<<<<<<<<
+=======
+ */
+  __pyx_v_cvmatptr = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_cvmat));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":808
+ *     populate_iplimage(warpmat, &cvmat)
+ *     cvmatptr = cvmat_ptr_from_iplimage(&cvmat)
+ *     c_cvWarpPerspective(&srcimg, &outimg, cvmatptr, flags, cvfill)             # <<<<<<<<<<<<<<
+ * 
+ *     PyMem_Free(cvmatptr)
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvWarpPerspective((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cvmatptr, __pyx_v_flags, __pyx_v_cvfill);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":810
+ *     c_cvWarpPerspective(&srcimg, &outimg, cvmatptr, flags, cvfill)
+ * 
+ *     PyMem_Free(cvmatptr)             # <<<<<<<<<<<<<<
+ * 
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     return out
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvLogPolar((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cv_center, __pyx_v_M, __pyx_v_flags);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":742
+=======
+  PyMem_Free(__pyx_v_cvmatptr);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":812
+ *     PyMem_Free(cvmatptr)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     c_cvLogPolar(&srcimg, &outimg, cv_center, M, flags)
  *     return out             # <<<<<<<<<<<<<<
  * 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  * def cvErode(np.ndarray src, np.ndarray element=None, int iterations=1,
+=======
+ * def cvLogPolar(np.ndarray src, center, double M,
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
   __Pyx_XDECREF(__pyx_r);
   __Pyx_INCREF(((PyObject *)__pyx_v_out));
@@ -6100,15 +9223,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_1);
   __Pyx_XDECREF(__pyx_t_3);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvLogPolar");
+=======
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvWarpPerspective");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_r = NULL;
   __pyx_L0:;
-  __Pyx_XDECREF((PyObject *)__pyx_v_out);
+  __Pyx_DECREF((PyObject *)__pyx_v_out);
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_FinishRefcountContext();
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":744
  *     return out
  * 
@@ -6126,10 +9254,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_
   PyObject *__pyx_v_in_place = 0;
   PyArrayObject *__pyx_v_out;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_v_iplkernel;
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":814
+ *     return out
+ * 
+ * def cvLogPolar(np.ndarray src, center, double M,             # <<<<<<<<<<<<<<
+ *                int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS):
+ * 
+ */
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+  PyArrayObject *__pyx_v_src = 0;
+  PyObject *__pyx_v_center = 0;
+  double __pyx_v_M;
+  int __pyx_v_flags;
+  PyArrayObject *__pyx_v_out = 0;
+  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f __pyx_v_cv_center;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg;
   PyObject *__pyx_r = NULL;
   int __pyx_t_1;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   PyObject *__pyx_t_2 = NULL;
   int __pyx_t_3;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_t_4;
@@ -6142,6 +9289,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_
     values[1] = (PyObject*)((PyArrayObject *)Py_None);
     values[3] = Py_None;
     values[4] = __pyx_k_54;
+=======
+  Py_ssize_t __pyx_t_2;
+  PyObject *__pyx_t_3 = NULL;
+  float __pyx_t_4;
+  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_center,&__pyx_kp_M,&__pyx_kp_flags,0};
+  __Pyx_SetupRefcountContext("cvLogPolar");
+  __pyx_self = __pyx_self;
+  if (unlikely(__pyx_kwds)) {
+    Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+    PyObject* values[4] = {0,0,0,0};
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
       case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
@@ -6157,6 +9315,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_
       if (likely(values[0])) kw_args--;
       else goto __pyx_L5_argtuple_error;
       case  1:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (kw_args > 0) {
         PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_element);
         if (unlikely(value)) { values[1] = value; kw_args--; }
@@ -6169,6 +9328,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_
       case  3:
       if (kw_args > 0) {
         PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_anchor);
+=======
+      values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_center);
+      if (likely(values[1])) kw_args--;
+      else {
+        __Pyx_RaiseArgtupleInvalid("cvLogPolar", 0, 3, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      }
+      case  2:
+      values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_M);
+      if (likely(values[2])) kw_args--;
+      else {
+        __Pyx_RaiseArgtupleInvalid("cvLogPolar", 0, 3, 4, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      }
+      case  3:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_flags);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
         if (unlikely(value)) { values[3] = value; kw_args--; }
       }
       case  4:
@@ -6178,6 +9353,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvErode") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
@@ -6200,12 +9376,34 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_
       case  3: __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  2: __pyx_v_element = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
       case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvLogPolar") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_center = values[1];
+    __pyx_v_M = __pyx_PyFloat_AsDouble(values[2]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    if (values[3]) {
+      __pyx_v_flags = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_flags = __pyx_k_128;
+    }
+  } else {
+    __pyx_v_flags = __pyx_k_128;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  4:
+      __pyx_v_flags = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  3:
+      __pyx_v_M = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      __pyx_v_center = PyTuple_GET_ITEM(__pyx_args, 1);
+      __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       break;
       default: goto __pyx_L5_argtuple_error;
     }
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvErode", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 744; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvErode");
@@ -6301,6 +9499,78 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_
   __pyx_L7:;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":764
+=======
+  __Pyx_RaiseArgtupleInvalid("cvLogPolar", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvLogPolar");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 814; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":817
+ *                int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS):
+ * 
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+ *     assert len(center) == 2
+ * 
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 817; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":818
+ * 
+ *     validate_array(src)
+ *     assert len(center) == 2             # <<<<<<<<<<<<<<
+ * 
+ *     cdef np.ndarray out = new_array_like(src)
+ */
+  #ifndef PYREX_WITHOUT_ASSERTIONS
+  __pyx_t_2 = PyObject_Length(__pyx_v_center); if (unlikely(__pyx_t_2 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!(__pyx_t_2 == 2))) {
+    PyErr_SetNone(PyExc_AssertionError);
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 818; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  }
+  #endif
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":820
+ *     assert len(center) == 2
+ * 
+ *     cdef np.ndarray out = new_array_like(src)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef CvPoint2D32f cv_center
+ */
+  __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 820; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __pyx_v_out = ((PyArrayObject *)__pyx_t_3);
+  __pyx_t_3 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":823
+ * 
+ *     cdef CvPoint2D32f cv_center
+ *     cv_center.x = <float>center[0]             # <<<<<<<<<<<<<<
+ *     cv_center.y = <float>center[1]
+ * 
+ */
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 823; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_cv_center.x = ((float)__pyx_t_4);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":824
+ *     cdef CvPoint2D32f cv_center
+ *     cv_center.x = <float>center[0]
+ *     cv_center.y = <float>center[1]             # <<<<<<<<<<<<<<
+ * 
+ *     cdef IplImage srcimg
+ */
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_center, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_4 = __pyx_PyFloat_AsDouble(__pyx_1); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 824; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_cv_center.y = ((float)__pyx_t_4);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":828
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage srcimg
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
@@ -6309,6 +9579,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":765
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)
@@ -6367,6 +9638,32 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_
  *         return out             # <<<<<<<<<<<<<<
  * 
  * def cvDilate(np.ndarray src, np.ndarray element=None, int iterations=1,
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":829
+ *     cdef IplImage outimg
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
+ * 
+ *     c_cvLogPolar(&srcimg, &outimg, cv_center, M, flags)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":831
+ *     populate_iplimage(out, &outimg)
+ * 
+ *     c_cvLogPolar(&srcimg, &outimg, cv_center, M, flags)             # <<<<<<<<<<<<<<
+ *     return out
+ * 
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvLogPolar((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_cv_center, __pyx_v_M, __pyx_v_flags);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":832
+ * 
+ *     c_cvLogPolar(&srcimg, &outimg, cv_center, M, flags)
+ *     return out             # <<<<<<<<<<<<<<
+ * 
+ * def cvErode(np.ndarray src, np.ndarray element=None, int iterations=1,
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
     __Pyx_XDECREF(__pyx_r);
     __Pyx_INCREF(((PyObject *)__pyx_v_out));
@@ -6378,16 +9675,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_XDECREF(__pyx_t_2);
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvErode");
+=======
+  __Pyx_XDECREF(__pyx_1);
+  __Pyx_XDECREF(__pyx_t_3);
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvLogPolar");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_r = NULL;
   __pyx_L0:;
-  __Pyx_DECREF((PyObject *)__pyx_v_out);
+  __Pyx_XDECREF((PyObject *)__pyx_v_out);
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_FinishRefcountContext();
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":776
  *         return out
  * 
@@ -6398,6 +9702,18 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *_
 
 static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
 static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":834
+ *     return out
+ * 
+ * def cvErode(np.ndarray src, np.ndarray element=None, int iterations=1,             # <<<<<<<<<<<<<<
+ *             anchor=None, in_place=False):
+ * 
+ */
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   PyArrayObject *__pyx_v_src = 0;
   PyArrayObject *__pyx_v_element = 0;
   int __pyx_v_iterations;
@@ -6413,14 +9729,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *
   int __pyx_t_3;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_t_4;
   static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_element,&__pyx_kp_iterations,&__pyx_kp_anchor,&__pyx_kp_in_place,0};
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_SetupRefcountContext("cvDilate");
+=======
+  __Pyx_SetupRefcountContext("cvErode");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_self = __pyx_self;
   if (unlikely(__pyx_kwds)) {
     Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
     PyObject* values[5] = {0,0,0,0,0};
     values[1] = (PyObject*)((PyArrayObject *)Py_None);
     values[3] = Py_None;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     values[4] = __pyx_k_55;
+=======
+    values[4] = __pyx_k_129;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
       case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
@@ -6457,12 +9781,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvDilate") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvErode") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     __pyx_v_element = ((PyArrayObject *)values[1]);
     if (values[2]) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_iterations = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      __pyx_v_iterations = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     } else {
       __pyx_v_iterations = 1;
     }
@@ -6472,11 +9804,19 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *
     __pyx_v_element = ((PyArrayObject *)Py_None);
     __pyx_v_iterations = 1;
     __pyx_v_anchor = Py_None;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_v_in_place = __pyx_k_55;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  5: __pyx_v_in_place = PyTuple_GET_ITEM(__pyx_args, 4);
       case  4: __pyx_v_anchor = PyTuple_GET_ITEM(__pyx_args, 3);
       case  3: __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+    __pyx_v_in_place = __pyx_k_129;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  5: __pyx_v_in_place = PyTuple_GET_ITEM(__pyx_args, 4);
+      case  4: __pyx_v_anchor = PyTuple_GET_ITEM(__pyx_args, 3);
+      case  3: __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  2: __pyx_v_element = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
       case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
       break;
@@ -6485,6 +9825,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvDilate", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 776; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvDilate");
@@ -6565,13 +9906,99 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *
   /*else*/ {
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":792
+=======
+  __Pyx_RaiseArgtupleInvalid("cvErode", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvErode");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+  __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_element), __pyx_ptype_5numpy_ndarray, 1, "element", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 834; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":837
+ *             anchor=None, in_place=False):
+ * 
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef np.ndarray out
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 837; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":842
+ *     cdef IplConvKernel* iplkernel
+ * 
+ *     if element == None:             # <<<<<<<<<<<<<<
+ *         iplkernel = NULL
+ *     else:
+ */
+  __pyx_t_2 = PyObject_RichCompare(((PyObject *)__pyx_v_element), Py_None, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 842; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  if (__pyx_t_3) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":843
+ * 
+ *     if element == None:
+ *         iplkernel = NULL             # <<<<<<<<<<<<<<
+ *     else:
+ *         iplkernel = get_IplConvKernel_ptr_from_array(element, anchor)
+ */
+    __pyx_v_iplkernel = NULL;
+    goto __pyx_L6;
+  }
+  /*else*/ {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":845
+ *         iplkernel = NULL
+ *     else:
+ *         iplkernel = get_IplConvKernel_ptr_from_array(element, anchor)             # <<<<<<<<<<<<<<
+ * 
+ *     if in_place:
+ */
+    __pyx_t_4 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array(__pyx_v_element, __pyx_v_anchor); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_v_iplkernel = __pyx_t_4;
+  }
+  __pyx_L6:;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":847
+ *         iplkernel = get_IplConvKernel_ptr_from_array(element, anchor)
+ * 
+ *     if in_place:             # <<<<<<<<<<<<<<
+ *         out = src
+ *     else:
+ */
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 847; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_3) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":848
+ * 
+ *     if in_place:
+ *         out = src             # <<<<<<<<<<<<<<
+ *     else:
+ *         out = new_array_like(src)
+ */
+    __Pyx_INCREF(((PyObject *)__pyx_v_src));
+    __Pyx_DECREF(((PyObject *)__pyx_v_out));
+    __pyx_v_out = __pyx_v_src;
+    goto __pyx_L7;
+  }
+  /*else*/ {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":850
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         out = src
  *     else:
  *         out = new_array_like(src)             # <<<<<<<<<<<<<<
  * 
  *     cdef IplImage srcimg
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 792; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+    __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 850; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(((PyObject *)__pyx_v_out));
     __pyx_v_out = ((PyArrayObject *)__pyx_t_2);
@@ -6579,7 +10006,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *
   }
   __pyx_L7:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":796
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":854
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage srcimg
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
@@ -6588,11 +10019,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":797
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":855
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)
  *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
  * 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  *     c_cvDilate(&srcimg, &outimg, iplkernel, iterations)
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
@@ -6611,21 +10047,52 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *
  * 
  *     free_IplConvKernel(iplkernel)             # <<<<<<<<<<<<<<
  * 
+=======
+ *     c_cvErode(&srcimg, &outimg, iplkernel, iterations)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":857
+ *     populate_iplimage(out, &outimg)
+ * 
+ *     c_cvErode(&srcimg, &outimg, iplkernel, iterations)             # <<<<<<<<<<<<<<
+ * 
+ *     free_IplConvKernel(iplkernel)
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvErode((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_iplkernel, __pyx_v_iterations);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":859
+ *     c_cvErode(&srcimg, &outimg, iplkernel, iterations)
+ * 
+ *     free_IplConvKernel(iplkernel)             # <<<<<<<<<<<<<<
+ * 
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     if in_place:
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_free_IplConvKernel(__pyx_v_iplkernel);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":803
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":861
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     free_IplConvKernel(iplkernel)
  * 
  *     if in_place:             # <<<<<<<<<<<<<<
  *         return None
  *     else:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 803; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_3) {
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":804
+=======
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 861; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_3) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":862
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if in_place:
  *         return None             # <<<<<<<<<<<<<<
@@ -6640,12 +10107,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":806
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":864
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *         return None
  *     else:
  *         return out             # <<<<<<<<<<<<<<
  * 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  * def cvMorphologyEx(np.ndarray src, np.ndarray element, int operation,
+=======
+ * def cvDilate(np.ndarray src, np.ndarray element=None, int iterations=1,
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
     __Pyx_XDECREF(__pyx_r);
     __Pyx_INCREF(((PyObject *)__pyx_v_out));
@@ -6658,7 +10133,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *
   goto __pyx_L0;
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_t_2);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvDilate");
+=======
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvErode");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_r = NULL;
   __pyx_L0:;
   __Pyx_DECREF((PyObject *)__pyx_v_out);
@@ -6667,6 +10146,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":808
  *         return out
  * 
@@ -6680,19 +10160,36 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb
   PyArrayObject *__pyx_v_src = 0;
   PyArrayObject *__pyx_v_element = 0;
   int __pyx_v_operation;
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":866
+ *         return out
+ * 
+ * def cvDilate(np.ndarray src, np.ndarray element=None, int iterations=1,             # <<<<<<<<<<<<<<
+ *             anchor=None, in_place=False):
+ * 
+ */
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+  PyArrayObject *__pyx_v_src = 0;
+  PyArrayObject *__pyx_v_element = 0;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   int __pyx_v_iterations;
   PyObject *__pyx_v_anchor = 0;
   PyObject *__pyx_v_in_place = 0;
   PyArrayObject *__pyx_v_out;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   PyArrayObject *__pyx_v_temp;
+=======
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_v_iplkernel;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_tempimg;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *__pyx_v_tempimgptr;
   PyObject *__pyx_r = NULL;
-  PyObject *__pyx_1 = 0;
   int __pyx_t_1;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_t_2;
   int __pyx_t_3;
   PyObject *__pyx_t_4 = NULL;
@@ -6709,6 +10206,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb
     values[5] = __pyx_k_56;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  6: values[5] = PyTuple_GET_ITEM(__pyx_args, 5);
+=======
+  PyObject *__pyx_t_2 = NULL;
+  int __pyx_t_3;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_t_4;
+  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_element,&__pyx_kp_iterations,&__pyx_kp_anchor,&__pyx_kp_in_place,0};
+  __Pyx_SetupRefcountContext("cvDilate");
+  __pyx_self = __pyx_self;
+  if (unlikely(__pyx_kwds)) {
+    Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+    PyObject* values[5] = {0,0,0,0,0};
+    values[1] = (PyObject*)((PyArrayObject *)Py_None);
+    values[3] = Py_None;
+    values[4] = __pyx_k_130;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
       case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
       case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
@@ -6723,6 +10235,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb
       if (likely(values[0])) kw_args--;
       else goto __pyx_L5_argtuple_error;
       case  1:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_element);
       if (likely(values[1])) kw_args--;
       else {
@@ -6743,14 +10256,35 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb
       if (kw_args > 0) {
         PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_anchor);
         if (unlikely(value)) { values[4] = value; kw_args--; }
+=======
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_element);
+        if (unlikely(value)) { values[1] = value; kw_args--; }
+      }
+      case  2:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_iterations);
+        if (unlikely(value)) { values[2] = value; kw_args--; }
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       }
       case  5:
       if (kw_args > 0) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
         PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_in_place);
         if (unlikely(value)) { values[5] = value; kw_args--; }
+=======
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_anchor);
+        if (unlikely(value)) { values[3] = value; kw_args--; }
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+      }
+      case  4:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_in_place);
+        if (unlikely(value)) { values[4] = value; kw_args--; }
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvMorphologyEx") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
@@ -6778,12 +10312,37 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb
       __pyx_v_operation = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_operation == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       __pyx_v_element = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
       __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvDilate") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 866; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_element = ((PyArrayObject *)values[1]);
+    if (values[2]) {
+      __pyx_v_iterations = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 866; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_iterations = 1;
+    }
+    __pyx_v_anchor = values[3];
+    __pyx_v_in_place = values[4];
+  } else {
+    __pyx_v_element = ((PyArrayObject *)Py_None);
+    __pyx_v_iterations = 1;
+    __pyx_v_anchor = Py_None;
+    __pyx_v_in_place = __pyx_k_130;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  5: __pyx_v_in_place = PyTuple_GET_ITEM(__pyx_args, 4);
+      case  4: __pyx_v_anchor = PyTuple_GET_ITEM(__pyx_args, 3);
+      case  3: __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 866; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  2: __pyx_v_element = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
+      case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       break;
       default: goto __pyx_L5_argtuple_error;
     }
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvMorphologyEx", 0, 3, 6, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 808; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvMorphologyEx");
@@ -6796,10 +10355,24 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyOb
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":811
  *                    int iterations=1, anchor=None, in_place=False):
+=======
+  __Pyx_RaiseArgtupleInvalid("cvDilate", 0, 1, 5, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 866; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvDilate");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+  __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 866; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_element), __pyx_ptype_5numpy_ndarray, 1, "element", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 866; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":869
+ *             anchor=None, in_place=False):
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  * 
  *     cdef np.ndarray out
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  */
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 811; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
@@ -7435,6 +11008,25 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
     if (__pyx_t_2) {
 
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":885
+=======
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 869; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":874
+ *     cdef IplConvKernel* iplkernel
+ * 
+ *     if element == None:             # <<<<<<<<<<<<<<
+ *         iplkernel = NULL
+ *     else:
+ */
+  __pyx_t_2 = PyObject_RichCompare(((PyObject *)__pyx_v_element), Py_None, Py_EQ); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_2); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 874; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  if (__pyx_t_3) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":875
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *         if out is not None:
  *             if src.dtype == FLOAT32:             # <<<<<<<<<<<<<<
@@ -7453,6 +11045,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
       __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
       if (__pyx_t_2) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
         /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":886
  *         if out is not None:
  *             if src.dtype == FLOAT32:
@@ -7498,12 +11091,43 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
  *             assert_same_shape(src, out)             # <<<<<<<<<<<<<<
  *         else:
  *             if src.dtype == FLOAT32:
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":877
+ *         iplkernel = NULL
+ *     else:
+ *         iplkernel = get_IplConvKernel_ptr_from_array(element, anchor)             # <<<<<<<<<<<<<<
+ * 
+ *     if in_place:
+ */
+    __pyx_t_4 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array(__pyx_v_element, __pyx_v_anchor); if (unlikely(__pyx_t_4 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 877; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_v_iplkernel = __pyx_t_4;
+  }
+  __pyx_L6:;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":879
+ *         iplkernel = get_IplConvKernel_ptr_from_array(element, anchor)
+ * 
+ *     if in_place:             # <<<<<<<<<<<<<<
+ *         out = src
+ *     else:
+ */
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 879; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_3) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":880
+ * 
+ *     if in_place:
+ *         out = src             # <<<<<<<<<<<<<<
+ *     else:
+ *         out = new_array_like(src)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
       __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 889; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       goto __pyx_L9;
     }
     /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":891
  *             assert_same_shape(src, out)
  *         else:
@@ -7543,6 +11167,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
  *                 out = new_array_like(src)
  *             else:
  *                 out = new_array_like_diff_dtype(src, INT16)             # <<<<<<<<<<<<<<
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":882
+ *         out = src
+ *     else:
+ *         out = new_array_like(src)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef IplImage srcimg
+ */
+    __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 882; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(((PyObject *)__pyx_v_out));
+    __pyx_v_out = ((PyArrayObject *)__pyx_t_2);
+    __pyx_t_2 = 0;
+  }
+  __pyx_L7:;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":886
+ *     cdef IplImage srcimg
+ *     cdef IplImage outimg
+ *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(out, &outimg)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     # CV_BLUR and CV_GAUSSIAN
  */
@@ -7561,12 +11207,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
     goto __pyx_L7;
   }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":897
  * 
  *     # CV_BLUR and CV_GAUSSIAN
  *     elif smoothtype == CV_BLUR or smoothtype == CV_GAUSSIAN:             # <<<<<<<<<<<<<<
  * 
  *         assert_dtype(src, [UINT8, INT8, FLOAT32])
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":887
+ *     cdef IplImage outimg
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
+ * 
+ *     c_cvDilate(&srcimg, &outimg, iplkernel, iterations)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
   __pyx_t_3 = PyInt_FromLong(__pyx_v_smoothtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 897; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
@@ -7595,13 +11250,21 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
   }
   if (__pyx_t_6) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":899
  *     elif smoothtype == CV_BLUR or smoothtype == CV_GAUSSIAN:
  * 
  *         assert_dtype(src, [UINT8, INT8, FLOAT32])             # <<<<<<<<<<<<<<
  *         assert_nchannels(src, [1, 3])
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":889
+ *     populate_iplimage(out, &outimg)
+ * 
+ *     c_cvDilate(&srcimg, &outimg, iplkernel, iterations)             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_2);
     __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_66); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -7623,6 +11286,12 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
     __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":900
+=======
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDilate((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_iplkernel, __pyx_v_iterations);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":891
+ *     c_cvDilate(&srcimg, &outimg, iplkernel, iterations)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *         assert_dtype(src, [UINT8, INT8, FLOAT32])
  *         assert_nchannels(src, [1, 3])             # <<<<<<<<<<<<<<
@@ -7640,17 +11309,29 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
     __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 900; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":902
  *         assert_nchannels(src, [1, 3])
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":893
+ *     free_IplConvKernel(iplkernel)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *         if in_place:             # <<<<<<<<<<<<<<
  *             out = src
  *         elif out is not None:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_6 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_in_place)); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 902; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     if (__pyx_t_6) {
 
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":903
+=======
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 893; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_3) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":894
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *         if in_place:
  *             out = src             # <<<<<<<<<<<<<<
@@ -7663,16 +11344,26 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
       goto __pyx_L12;
     }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":904
  *         if in_place:
  *             out = src
  *         elif out is not None:             # <<<<<<<<<<<<<<
  *             assert_like(src, out)
  *         else:
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":896
+ *         return None
+ *     else:
+ *         return out             # <<<<<<<<<<<<<<
+ * 
+ * def cvMorphologyEx(np.ndarray src, np.ndarray element, int operation,
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
     __pyx_t_6 = (((PyObject *)__pyx_v_out) != Py_None);
     if (__pyx_t_6) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":905
  *             out = src
  *         elif out is not None:
@@ -7689,18 +11380,148 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
  *             assert_like(src, out)
  *         else:
  *             out = new_array_like(src)             # <<<<<<<<<<<<<<
+=======
+  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  goto __pyx_L0;
+  __pyx_L1_error:;
+  __Pyx_XDECREF(__pyx_t_2);
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvDilate");
+  __pyx_r = NULL;
+  __pyx_L0:;
+  __Pyx_DECREF((PyObject *)__pyx_v_out);
+  __Pyx_XGIVEREF(__pyx_r);
+  __Pyx_FinishRefcountContext();
+  return __pyx_r;
+}
+
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":898
+ *         return out
+ * 
+ * def cvMorphologyEx(np.ndarray src, np.ndarray element, int operation,             # <<<<<<<<<<<<<<
+ *                    int iterations=1, anchor=None, in_place=False):
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     # CV_MEDIAN and CV_BILATERAL
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 907; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(__pyx_t_3);
       __Pyx_DECREF(((PyObject *)__pyx_v_out));
       __pyx_v_out = ((PyArrayObject *)__pyx_t_3);
       __pyx_t_3 = 0;
+=======
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+  PyArrayObject *__pyx_v_src = 0;
+  PyArrayObject *__pyx_v_element = 0;
+  int __pyx_v_operation;
+  int __pyx_v_iterations;
+  PyObject *__pyx_v_anchor = 0;
+  PyObject *__pyx_v_in_place = 0;
+  PyArrayObject *__pyx_v_out;
+  PyArrayObject *__pyx_v_temp;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_v_iplkernel;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_tempimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *__pyx_v_tempimgptr;
+  PyObject *__pyx_r = NULL;
+  PyObject *__pyx_1 = 0;
+  int __pyx_t_1;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *__pyx_t_2;
+  int __pyx_t_3;
+  PyObject *__pyx_t_4 = NULL;
+  PyObject *__pyx_t_5 = NULL;
+  int __pyx_t_6;
+  int __pyx_t_7;
+  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_element,&__pyx_kp_operation,&__pyx_kp_iterations,&__pyx_kp_anchor,&__pyx_kp_in_place,0};
+  __Pyx_SetupRefcountContext("cvMorphologyEx");
+  __pyx_self = __pyx_self;
+  if (unlikely(__pyx_kwds)) {
+    Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+    PyObject* values[6] = {0,0,0,0,0,0};
+    values[4] = Py_None;
+    values[5] = __pyx_k_131;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  6: values[5] = PyTuple_GET_ITEM(__pyx_args, 5);
+      case  5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
+      case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
+      case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
+      case  2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
+      case  1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
+      case  0: break;
+      default: goto __pyx_L5_argtuple_error;
+    }
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  0:
+      values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_src);
+      if (likely(values[0])) kw_args--;
+      else goto __pyx_L5_argtuple_error;
+      case  1:
+      values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_element);
+      if (likely(values[1])) kw_args--;
+      else {
+        __Pyx_RaiseArgtupleInvalid("cvMorphologyEx", 0, 3, 6, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      }
+      case  2:
+      values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_operation);
+      if (likely(values[2])) kw_args--;
+      else {
+        __Pyx_RaiseArgtupleInvalid("cvMorphologyEx", 0, 3, 6, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      }
+      case  3:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_iterations);
+        if (unlikely(value)) { values[3] = value; kw_args--; }
+      }
+      case  4:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_anchor);
+        if (unlikely(value)) { values[4] = value; kw_args--; }
+      }
+      case  5:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_in_place);
+        if (unlikely(value)) { values[5] = value; kw_args--; }
+      }
+    }
+    if (unlikely(kw_args > 0)) {
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvMorphologyEx") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_element = ((PyArrayObject *)values[1]);
+    __pyx_v_operation = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_operation == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    if (values[3]) {
+      __pyx_v_iterations = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_iterations = 1;
+    }
+    __pyx_v_anchor = values[4];
+    __pyx_v_in_place = values[5];
+  } else {
+    __pyx_v_iterations = 1;
+    __pyx_v_anchor = Py_None;
+    __pyx_v_in_place = __pyx_k_131;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  6:
+      __pyx_v_in_place = PyTuple_GET_ITEM(__pyx_args, 5);
+      case  5:
+      __pyx_v_anchor = PyTuple_GET_ITEM(__pyx_args, 4);
+      case  4:
+      __pyx_v_iterations = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_iterations == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  3:
+      __pyx_v_operation = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_operation == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      __pyx_v_element = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
+      __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+      break;
+      default: goto __pyx_L5_argtuple_error;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     }
     __pyx_L12:;
     goto __pyx_L7;
   }
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /*else*/ {
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":911
@@ -7708,8 +11529,27 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
  *     else:
  *         assert_dtype(src, [UINT8, INT8])             # <<<<<<<<<<<<<<
  *         assert_nchannels(src, [1, 3])
+=======
+  goto __pyx_L4_argument_unpacking_done;
+  __pyx_L5_argtuple_error:;
+  __Pyx_RaiseArgtupleInvalid("cvMorphologyEx", 0, 3, 6, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvMorphologyEx");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+  __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  __pyx_v_temp = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_element), __pyx_ptype_5numpy_ndarray, 1, "element", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 898; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":901
+ *                    int iterations=1, anchor=None, in_place=False):
+ * 
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_2);
     __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_66); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 911; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -7758,8 +11598,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
  *         if in_place:
  *             raise RuntimeError('In place operation not supported with this '             # <<<<<<<<<<<<<<
  *                                'filter')
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 901; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":907
+ *     cdef IplConvKernel* iplkernel
+ * 
+ *     iplkernel = get_IplConvKernel_ptr_from_array(element, anchor)             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 915; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       __Pyx_GOTREF(((PyObject *)__pyx_t_3));
       __Pyx_INCREF(__pyx_kp_88);
@@ -7777,21 +11626,36 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":918
  *                                'filter')
+=======
+  __pyx_t_2 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array(__pyx_v_element, __pyx_v_anchor); if (unlikely(__pyx_t_2 == NULL)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 907; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_v_iplkernel = __pyx_t_2;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":909
+ *     iplkernel = get_IplConvKernel_ptr_from_array(element, anchor)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *         if out is not None:             # <<<<<<<<<<<<<<
  *             assert_like(src, out)
  *         else:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_6 = (((PyObject *)__pyx_v_out) != Py_None);
     if (__pyx_t_6) {
 
       /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":919
+=======
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 909; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_3) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":910
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *         if out is not None:
  *             assert_like(src, out)             # <<<<<<<<<<<<<<
  *         else:
  *             out = new_array_like(src)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 919; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       goto __pyx_L14;
     }
@@ -7811,18 +11675,54 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
       __pyx_t_4 = 0;
     }
     __pyx_L14:;
+=======
+    __Pyx_INCREF(((PyObject *)__pyx_v_src));
+    __Pyx_DECREF(((PyObject *)__pyx_v_out));
+    __pyx_v_out = __pyx_v_src;
+    goto __pyx_L6;
   }
-  __pyx_L7:;
+  /*else*/ {
 
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":912
+ *         out = src
+ *     else:
+ *         out = new_array_like(src)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef IplImage srcimg
+ */
+    __pyx_t_4 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 912; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_4);
+    __Pyx_DECREF(((PyObject *)__pyx_v_out));
+    __pyx_v_out = ((PyArrayObject *)__pyx_t_4);
+    __pyx_t_4 = 0;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  }
+  __pyx_L6:;
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":925
  *     cdef IplImage srcimg
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":917
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     cdef IplImage outimg
+ *     cdef IplImage tempimg
+ *     cdef IplImage* tempimgptr = &tempimg             # <<<<<<<<<<<<<<
+ * 
+ *     populate_iplimage(src, &srcimg)
+ */
+  __pyx_v_tempimgptr = (&__pyx_v_tempimg);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":919
+ *     cdef IplImage* tempimgptr = &tempimg
+ * 
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
  *     populate_iplimage(out, &outimg)
  * 
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":926
  *     cdef IplImage outimg
  *     populate_iplimage(src, &srcimg)
@@ -7836,9 +11736,233 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
  *     populate_iplimage(out, &outimg)
  * 
  *     c_cvSmooth(&srcimg, &outimg, smoothtype, param1, param2, param3, param4)             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":920
+ * 
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
+ * 
+ *     # determine if we need the tempimg
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":923
+ * 
+ *     # determine if we need the tempimg
+ *     if operation == CV_MOP_OPEN or operation == CV_MOP_CLOSE:             # <<<<<<<<<<<<<<
+ *         tempimgptr = NULL
+ *     elif operation == CV_MOP_GRADIENT:
+ */
+  __pyx_t_4 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_OPEN); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+  if (!__pyx_t_3) {
+    __pyx_t_5 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_5);
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_CLOSE); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_4 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_4);
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 923; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+    __pyx_t_7 = __pyx_t_6;
+  } else {
+    __pyx_t_7 = __pyx_t_3;
+  }
+  if (__pyx_t_7) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":924
+ *     # determine if we need the tempimg
+ *     if operation == CV_MOP_OPEN or operation == CV_MOP_CLOSE:
+ *         tempimgptr = NULL             # <<<<<<<<<<<<<<
+ *     elif operation == CV_MOP_GRADIENT:
+ *         temp = new_array_like(src)
+ */
+    __pyx_v_tempimgptr = NULL;
+    goto __pyx_L7;
+  }
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":925
+ *     if operation == CV_MOP_OPEN or operation == CV_MOP_CLOSE:
+ *         tempimgptr = NULL
+ *     elif operation == CV_MOP_GRADIENT:             # <<<<<<<<<<<<<<
+ *         temp = new_array_like(src)
+ *         populate_iplimage(temp, &tempimg)
+ */
+  __pyx_t_4 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_GRADIENT); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 925; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+  if (__pyx_t_7) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":926
+ *         tempimgptr = NULL
+ *     elif operation == CV_MOP_GRADIENT:
+ *         temp = new_array_like(src)             # <<<<<<<<<<<<<<
+ *         populate_iplimage(temp, &tempimg)
+ *     elif operation == CV_MOP_TOPHAT or operation == CV_MOP_BLACKHAT:
+ */
+    __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 926; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_5);
+    __Pyx_DECREF(((PyObject *)__pyx_v_temp));
+    __pyx_v_temp = ((PyArrayObject *)__pyx_t_5);
+    __pyx_t_5 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":927
+ *     elif operation == CV_MOP_GRADIENT:
+ *         temp = new_array_like(src)
+ *         populate_iplimage(temp, &tempimg)             # <<<<<<<<<<<<<<
+ *     elif operation == CV_MOP_TOPHAT or operation == CV_MOP_BLACKHAT:
+ *         if in_place:
+ */
+    __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_temp, (&__pyx_v_tempimg));
+    goto __pyx_L7;
+  }
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":928
+ *         temp = new_array_like(src)
+ *         populate_iplimage(temp, &tempimg)
+ *     elif operation == CV_MOP_TOPHAT or operation == CV_MOP_BLACKHAT:             # <<<<<<<<<<<<<<
+ *         if in_place:
+ *             temp = new_array_like(src)
+ */
+  __pyx_t_5 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_TOPHAT); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_4 = PyObject_RichCompare(__pyx_t_5, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_7 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_7 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+  if (!__pyx_t_7) {
+    __pyx_t_4 = PyInt_FromLong(__pyx_v_operation); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_4);
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_MOP_BLACKHAT); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_5 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_5);
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 928; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+    __pyx_t_6 = __pyx_t_3;
+  } else {
+    __pyx_t_6 = __pyx_t_7;
+  }
+  if (__pyx_t_6) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":929
+ *         populate_iplimage(temp, &tempimg)
+ *     elif operation == CV_MOP_TOPHAT or operation == CV_MOP_BLACKHAT:
+ *         if in_place:             # <<<<<<<<<<<<<<
+ *             temp = new_array_like(src)
+ *             populate_iplimage(temp, &tempimg)
+ */
+    __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 929; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (__pyx_t_6) {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":930
+ *     elif operation == CV_MOP_TOPHAT or operation == CV_MOP_BLACKHAT:
+ *         if in_place:
+ *             temp = new_array_like(src)             # <<<<<<<<<<<<<<
+ *             populate_iplimage(temp, &tempimg)
+ *         else:
+ */
+      __pyx_t_5 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 930; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_5);
+      __Pyx_DECREF(((PyObject *)__pyx_v_temp));
+      __pyx_v_temp = ((PyArrayObject *)__pyx_t_5);
+      __pyx_t_5 = 0;
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":931
+ *         if in_place:
+ *             temp = new_array_like(src)
+ *             populate_iplimage(temp, &tempimg)             # <<<<<<<<<<<<<<
+ *         else:
+ *             tempimgptr = NULL
+ */
+      __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_temp, (&__pyx_v_tempimg));
+      goto __pyx_L8;
+    }
+    /*else*/ {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":933
+ *             populate_iplimage(temp, &tempimg)
+ *         else:
+ *             tempimgptr = NULL             # <<<<<<<<<<<<<<
+ *     else:
+ *         raise RuntimeError('operation type not understood')
+ */
+      __pyx_v_tempimgptr = NULL;
+    }
+    __pyx_L8:;
+    goto __pyx_L7;
+  }
+  /*else*/ {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":935
+ *             tempimgptr = NULL
+ *     else:
+ *         raise RuntimeError('operation type not understood')             # <<<<<<<<<<<<<<
+ * 
+ *     c_cvMorphologyEx(&srcimg, &outimg, tempimgptr, iplkernel, operation,
+ */
+    __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_5));
+    __Pyx_INCREF(__pyx_kp_159);
+    PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_kp_159);
+    __Pyx_GIVEREF(__pyx_kp_159);
+    __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_5), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_4);
+    __Pyx_DECREF(((PyObject *)__pyx_t_5)); __pyx_t_5 = 0;
+    __Pyx_Raise(__pyx_t_4, 0, 0);
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  }
+  __pyx_L7:;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":938
+ * 
+ *     c_cvMorphologyEx(&srcimg, &outimg, tempimgptr, iplkernel, operation,
+ *                      iterations)             # <<<<<<<<<<<<<<
+ * 
+ *     free_IplConvKernel(iplkernel)
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvMorphologyEx((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_tempimgptr, __pyx_v_iplkernel, __pyx_v_operation, __pyx_v_iterations);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":940
+ *                      iterations)
+ * 
+ *     free_IplConvKernel(iplkernel)             # <<<<<<<<<<<<<<
+ * 
+ *     if in_place:
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_free_IplConvKernel(__pyx_v_iplkernel);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":942
+ *     free_IplConvKernel(iplkernel)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     return out
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSmooth((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_smoothtype, __pyx_v_param1, __pyx_v_param2, __pyx_v_param3, __pyx_v_param4);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":930
@@ -7852,24 +11976,65 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *
   __Pyx_INCREF(((PyObject *)__pyx_v_out));
   __pyx_r = ((PyObject *)__pyx_v_out);
   goto __pyx_L0;
+=======
+  __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 942; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_6) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":943
+ * 
+ *     if in_place:
+ *         return None             # <<<<<<<<<<<<<<
+ *     else:
+ *         return out
+ */
+    __Pyx_XDECREF(__pyx_r);
+    __Pyx_INCREF(Py_None);
+    __pyx_r = Py_None;
+    goto __pyx_L0;
+    goto __pyx_L9;
+  }
+  /*else*/ {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":945
+ *         return None
+ *     else:
+ *         return out             # <<<<<<<<<<<<<<
+ * 
+ * def cvSmooth(np.ndarray src, np.ndarray out=None,
+ */
+    __Pyx_XDECREF(__pyx_r);
+    __Pyx_INCREF(((PyObject *)__pyx_v_out));
+    __pyx_r = ((PyObject *)__pyx_v_out);
+    goto __pyx_L0;
+  }
+  __pyx_L9:;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_XDECREF(__pyx_2);
   __Pyx_XDECREF(__pyx_3);
   __Pyx_XDECREF(__pyx_t_3);
   __Pyx_XDECREF(__pyx_t_4);
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvSmooth");
+=======
+  __Pyx_XDECREF(__pyx_t_4);
+  __Pyx_XDECREF(__pyx_t_5);
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvMorphologyEx");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_r = NULL;
   __pyx_L0:;
   __Pyx_DECREF((PyObject *)__pyx_v_out);
+  __Pyx_DECREF((PyObject *)__pyx_v_temp);
   __Pyx_XGIVEREF(__pyx_r);
   __Pyx_FinishRefcountContext();
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":932
  *     return out
  * 
@@ -7890,9 +12055,35 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg;
   __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_kernelimg;
   struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cv_kernel;
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":947
+ *         return out
+ * 
+ * def cvSmooth(np.ndarray src, np.ndarray out=None,             # <<<<<<<<<<<<<<
+ *              int smoothtype=CV_GAUSSIAN, int param1=3,
+ *              int param2=0, double param3=0, double param4=0,
+ */
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static char __pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvSmooth[] = "\n    better doc string needed.\n    for now:\n    http://opencv.willowgarage.com/documentation/cvreference.html\n    ";
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+  PyArrayObject *__pyx_v_src = 0;
+  PyArrayObject *__pyx_v_out = 0;
+  int __pyx_v_smoothtype;
+  int __pyx_v_param1;
+  int __pyx_v_param2;
+  double __pyx_v_param3;
+  double __pyx_v_param4;
+  PyObject *__pyx_v_in_place = 0;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   PyObject *__pyx_r = NULL;
   PyObject *__pyx_1 = 0;
+  PyObject *__pyx_2 = 0;
+  PyObject *__pyx_3 = 0;
   int __pyx_t_1;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   PyObject *__pyx_t_2 = NULL;
   int __pyx_t_3;
   Py_ssize_t __pyx_t_4;
@@ -7906,6 +12097,26 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject
     values[2] = Py_None;
     values[3] = __pyx_k_59;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
+=======
+  int __pyx_t_2;
+  PyObject *__pyx_t_3 = NULL;
+  PyObject *__pyx_t_4 = NULL;
+  int __pyx_t_5;
+  int __pyx_t_6;
+  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_out,&__pyx_kp_smoothtype,&__pyx_kp_33,&__pyx_kp_34,&__pyx_kp_35,&__pyx_kp_36,&__pyx_kp_in_place,0};
+  __Pyx_SetupRefcountContext("cvSmooth");
+  __pyx_self = __pyx_self;
+  if (unlikely(__pyx_kwds)) {
+    Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+    PyObject* values[8] = {0,0,0,0,0,0,0,0};
+    values[1] = (PyObject*)((PyArrayObject *)Py_None);
+    values[7] = (PyObject*)__pyx_k_133;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  8: values[7] = PyTuple_GET_ITEM(__pyx_args, 7);
+      case  7: values[6] = PyTuple_GET_ITEM(__pyx_args, 6);
+      case  6: values[5] = PyTuple_GET_ITEM(__pyx_args, 5);
+      case  5: values[4] = PyTuple_GET_ITEM(__pyx_args, 4);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
       case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
       case  2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
@@ -7919,6 +12130,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject
       if (likely(values[0])) kw_args--;
       else goto __pyx_L5_argtuple_error;
       case  1:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_kernel);
       if (likely(values[1])) kw_args--;
       else {
@@ -7927,11 +12139,24 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject
       case  2:
       if (kw_args > 0) {
         PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_anchor);
+=======
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_out);
+        if (unlikely(value)) { values[1] = value; kw_args--; }
+      }
+      case  2:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_smoothtype);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
         if (unlikely(value)) { values[2] = value; kw_args--; }
       }
       case  3:
       if (kw_args > 0) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
         PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_in_place);
+=======
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_33);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
         if (unlikely(value)) { values[3] = value; kw_args--; }
       }
     }
@@ -7947,6 +12172,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject
     __pyx_v_in_place = __pyx_k_59;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  4:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       __pyx_v_in_place = PyTuple_GET_ITEM(__pyx_args, 3);
       case  3:
       __pyx_v_anchor = PyTuple_GET_ITEM(__pyx_args, 2);
@@ -8111,10 +12337,83 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject
  */
       PyErr_SetObject(PyExc_AssertionError, __pyx_kp_90);
       {__pyx_filename = __pyx_f[0]; __pyx_lineno = 945; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_34);
+        if (unlikely(value)) { values[4] = value; kw_args--; }
+      }
+      case  5:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_35);
+        if (unlikely(value)) { values[5] = value; kw_args--; }
+      }
+      case  6:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_36);
+        if (unlikely(value)) { values[6] = value; kw_args--; }
+      }
+      case  7:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_in_place);
+        if (unlikely(value)) { values[7] = value; kw_args--; }
+      }
+    }
+    if (unlikely(kw_args > 0)) {
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvSmooth") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_out = ((PyArrayObject *)values[1]);
+    if (values[2]) {
+      __pyx_v_smoothtype = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_smoothtype == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_smoothtype = __pyx_k_132;
+    }
+    if (values[3]) {
+      __pyx_v_param1 = __Pyx_PyInt_AsInt(values[3]); if (unlikely((__pyx_v_param1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_param1 = 3;
+    }
+    if (values[4]) {
+      __pyx_v_param2 = __Pyx_PyInt_AsInt(values[4]); if (unlikely((__pyx_v_param2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_param2 = 0;
+    }
+    if (values[5]) {
+      __pyx_v_param3 = __pyx_PyFloat_AsDouble(values[5]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_param3 = ((double)0);
+    }
+    if (values[6]) {
+      __pyx_v_param4 = __pyx_PyFloat_AsDouble(values[6]); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_param4 = ((double)0);
+    }
+    __pyx_v_in_place = ((PyObject *)values[7]);
+  } else {
+    __pyx_v_out = ((PyArrayObject *)Py_None);
+    __pyx_v_smoothtype = __pyx_k_132;
+    __pyx_v_param1 = 3;
+    __pyx_v_param2 = 0;
+    __pyx_v_param3 = ((double)0);
+    __pyx_v_param4 = ((double)0);
+    __pyx_v_in_place = __pyx_k_133;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  8: __pyx_v_in_place = ((PyObject *)PyTuple_GET_ITEM(__pyx_args, 7));
+      case  7: __pyx_v_param4 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 6)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  6: __pyx_v_param3 = __pyx_PyFloat_AsDouble(PyTuple_GET_ITEM(__pyx_args, 5)); if (unlikely(PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  5: __pyx_v_param2 = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 4)); if (unlikely((__pyx_v_param2 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 949; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  4: __pyx_v_param1 = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 3)); if (unlikely((__pyx_v_param1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  3: __pyx_v_smoothtype = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_smoothtype == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  2: __pyx_v_out = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
+      case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+      break;
+      default: goto __pyx_L5_argtuple_error;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     }
     #endif
     goto __pyx_L6;
   }
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /*else*/ {
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":949
@@ -8139,35 +12438,80 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":954
  *     cdef np.ndarray out
+=======
+  goto __pyx_L4_argument_unpacking_done;
+  __pyx_L5_argtuple_error:;
+  __Pyx_RaiseArgtupleInvalid("cvSmooth", 0, 1, 8, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvSmooth");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+  __Pyx_INCREF((PyObject *)__pyx_v_out);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_out), __pyx_ptype_5numpy_ndarray, 1, "out", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 947; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_in_place), &PyBool_Type, 1, "in_place", 1))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":957
+ *     """
  * 
- *     if in_place:             # <<<<<<<<<<<<<<
- *         out = src
- *     else:
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+ *     if out is not None:
+ *         validate_array(out)
  */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":958
+ * 
+ *     validate_array(src)
+ *     if out is not None:             # <<<<<<<<<<<<<<
+ *         validate_array(out)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 954; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_3) {
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":955
+=======
+  __pyx_t_2 = (((PyObject *)__pyx_v_out) != Py_None);
+  if (__pyx_t_2) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":959
+ *     validate_array(src)
+ *     if out is not None:
+ *         validate_array(out)             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- *     if in_place:
- *         out = src             # <<<<<<<<<<<<<<
- *     else:
- *         out = new_array_like(src)
+ *     # there are restrictions that must be placed on the data depending on
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __Pyx_INCREF(((PyObject *)__pyx_v_src));
     __Pyx_DECREF(((PyObject *)__pyx_v_out));
     __pyx_v_out = __pyx_v_src;
     goto __pyx_L7;
+=======
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 959; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    goto __pyx_L6;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   }
-  /*else*/ {
+  __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":957
  *         out = src
  *     else:
  *         out = new_array_like(src)             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":965
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- *     cdef IplImage srcimg
+ *     # CV_BLUR_NO_SCALE
+ *     if smoothtype == CV_BLUR_NO_SCALE:             # <<<<<<<<<<<<<<
+ * 
+ *         if in_place:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 957; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_2);
     __Pyx_DECREF(((PyObject *)__pyx_v_out));
@@ -8182,9 +12526,53 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
  *     populate_iplimage(out, &outimg)
  *     populate_iplimage(kernel, &kernelimg)
- */
-  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
+=======
+  __pyx_t_3 = PyInt_FromLong(__pyx_v_smoothtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_BLUR_NO_SCALE); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 965; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+  if (__pyx_t_2) {
 
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":967
+ *     if smoothtype == CV_BLUR_NO_SCALE:
+ * 
+ *         if in_place:             # <<<<<<<<<<<<<<
+ *             raise RuntimeError('In place operation not supported with this '
+ *                                'filter')
+ */
+    __pyx_t_2 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_in_place)); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 967; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (__pyx_t_2) {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":968
+ * 
+ *         if in_place:
+ *             raise RuntimeError('In place operation not supported with this '             # <<<<<<<<<<<<<<
+ *                                'filter')
+ * 
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ */
+      __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+      __Pyx_INCREF(__pyx_kp_160);
+      PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_kp_160);
+      __Pyx_GIVEREF(__pyx_kp_160);
+      __pyx_t_3 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_4), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_3);
+      __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+      __Pyx_Raise(__pyx_t_3, 0, 0);
+      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 968; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      goto __pyx_L8;
+    }
+    __pyx_L8:;
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":963
  *     cdef IplImage kernelimg
  *     populate_iplimage(src, &srcimg)
@@ -8225,28 +12613,298 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject
  *     c_cvFilter2D(&srcimg, &outimg, cv_kernel, cv_anchor)
  * 
  *     PyMem_Free(cv_kernel)             # <<<<<<<<<<<<<<
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":971
+ *                                'filter')
+ * 
+ *         assert_dtype(src, [UINT8, INT8, FLOAT32])             # <<<<<<<<<<<<<<
+ *         assert_ndims(src, [2])
  * 
- *     if in_place:
  */
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_140); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_2);
+    __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_3);
+    __pyx_t_3 = PyList_New(3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+    PyList_SET_ITEM(__pyx_t_3, 0, __pyx_1);
+    __Pyx_GIVEREF(__pyx_1);
+    PyList_SET_ITEM(__pyx_t_3, 1, __pyx_2);
+    __Pyx_GIVEREF(__pyx_2);
+    PyList_SET_ITEM(__pyx_t_3, 2, __pyx_3);
+    __Pyx_GIVEREF(__pyx_3);
+    __pyx_1 = 0;
+    __pyx_2 = 0;
+    __pyx_3 = 0;
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 971; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":972
+ * 
+ *         assert_dtype(src, [UINT8, INT8, FLOAT32])
+ *         assert_ndims(src, [2])             # <<<<<<<<<<<<<<
+ * 
+ *         if out is not None:
+ */
+    __pyx_t_3 = PyList_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+    __Pyx_INCREF(__pyx_int_2);
+    PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_2);
+    __Pyx_GIVEREF(__pyx_int_2);
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 972; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":974
+ *         assert_ndims(src, [2])
+ * 
+ *         if out is not None:             # <<<<<<<<<<<<<<
+ *             if src.dtype == FLOAT32:
+ *                 assert_dtype(out, [FLOAT32])
+ */
+    __pyx_t_2 = (((PyObject *)__pyx_v_out) != Py_None);
+    if (__pyx_t_2) {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":975
+ * 
+ *         if out is not None:
+ *             if src.dtype == FLOAT32:             # <<<<<<<<<<<<<<
+ *                 assert_dtype(out, [FLOAT32])
+ *             else:
+ */
+      __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_3);
+      __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_1);
+      __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_4);
+      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+      __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 975; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+      if (__pyx_t_2) {
+
+        /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":976
+ *         if out is not None:
+ *             if src.dtype == FLOAT32:
+ *                 assert_dtype(out, [FLOAT32])             # <<<<<<<<<<<<<<
+ *             else:
+ *                 assert_dtype(out, [INT16])
+ */
+        __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __Pyx_GOTREF(__pyx_2);
+        __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+        PyList_SET_ITEM(__pyx_t_4, 0, __pyx_2);
+        __Pyx_GIVEREF(__pyx_2);
+        __pyx_2 = 0;
+        __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_4)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 976; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+        goto __pyx_L10;
+      }
+      /*else*/ {
+
+        /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":978
+ *                 assert_dtype(out, [FLOAT32])
+ *             else:
+ *                 assert_dtype(out, [INT16])             # <<<<<<<<<<<<<<
+ *             assert_same_shape(src, out)
+ *         else:
+ */
+        __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_142); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __Pyx_GOTREF(__pyx_3);
+        __pyx_t_4 = PyList_New(1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __Pyx_GOTREF(((PyObject *)__pyx_t_4));
+        PyList_SET_ITEM(__pyx_t_4, 0, __pyx_3);
+        __Pyx_GIVEREF(__pyx_3);
+        __pyx_3 = 0;
+        __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_out, ((PyObject *)__pyx_t_4)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __Pyx_DECREF(((PyObject *)__pyx_t_4)); __pyx_t_4 = 0;
+      }
+      __pyx_L10:;
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":979
+ *             else:
+ *                 assert_dtype(out, [INT16])
+ *             assert_same_shape(src, out)             # <<<<<<<<<<<<<<
+ *         else:
+ *             if src.dtype == FLOAT32:
+ */
+      __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 979; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      goto __pyx_L9;
+    }
+    /*else*/ {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":981
+ *             assert_same_shape(src, out)
+ *         else:
+ *             if src.dtype == FLOAT32:             # <<<<<<<<<<<<<<
+ *                 out = new_array_like(src)
+ *             else:
+ */
+      __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_4);
+      __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_1);
+      __pyx_t_3 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_3);
+      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+      __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+      __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      if (__pyx_t_2) {
+
+        /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":982
+ *         else:
+ *             if src.dtype == FLOAT32:
+ *                 out = new_array_like(src)             # <<<<<<<<<<<<<<
+ *             else:
+ *                 out = new_array_like_diff_dtype(src, INT16)
+ */
+        __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 982; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __Pyx_GOTREF(__pyx_t_3);
+        __Pyx_DECREF(((PyObject *)__pyx_v_out));
+        __pyx_v_out = ((PyArrayObject *)__pyx_t_3);
+        __pyx_t_3 = 0;
+        goto __pyx_L11;
+      }
+      /*else*/ {
+
+        /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":984
+ *                 out = new_array_like(src)
+ *             else:
+ *                 out = new_array_like_diff_dtype(src, INT16)             # <<<<<<<<<<<<<<
+ * 
+ *     # CV_BLUR and CV_GAUSSIAN
+ */
+        __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_142); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __Pyx_GOTREF(__pyx_2);
+        __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype(__pyx_v_src, __pyx_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 984; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+        __Pyx_GOTREF(__pyx_t_3);
+        __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+        __Pyx_DECREF(((PyObject *)__pyx_v_out));
+        __pyx_v_out = ((PyArrayObject *)__pyx_t_3);
+        __pyx_t_3 = 0;
+      }
+      __pyx_L11:;
+    }
+    __pyx_L9:;
+    goto __pyx_L7;
+  }
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":987
+ * 
+ *     # CV_BLUR and CV_GAUSSIAN
+ *     elif smoothtype == CV_BLUR or smoothtype == CV_GAUSSIAN:             # <<<<<<<<<<<<<<
+ * 
+ *         assert_dtype(src, [UINT8, INT8, FLOAT32])
+ */
+  __pyx_t_3 = PyInt_FromLong(__pyx_v_smoothtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_BLUR); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_4 = PyObject_RichCompare(__pyx_t_3, __pyx_3, Py_EQ); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_t_2 = __Pyx_PyObject_IsTrue(__pyx_t_4); if (unlikely(__pyx_t_2 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+  if (!__pyx_t_2) {
+    __pyx_t_4 = PyInt_FromLong(__pyx_v_smoothtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_4);
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_GAUSSIAN); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_3 = PyObject_RichCompare(__pyx_t_4, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_t_5 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_5 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 987; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __pyx_t_6 = __pyx_t_5;
+  } else {
+    __pyx_t_6 = __pyx_t_2;
+  }
+  if (__pyx_t_6) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":989
+ *     elif smoothtype == CV_BLUR or smoothtype == CV_GAUSSIAN:
+ * 
+ *         assert_dtype(src, [UINT8, INT8, FLOAT32])             # <<<<<<<<<<<<<<
+ *         assert_nchannels(src, [1, 3])
+ * 
+ */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 989; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_2);
+    __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_140); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 989; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_3);
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 989; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_3 = PyList_New(3); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 989; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+    PyList_SET_ITEM(__pyx_t_3, 0, __pyx_2);
+    __Pyx_GIVEREF(__pyx_2);
+    PyList_SET_ITEM(__pyx_t_3, 1, __pyx_3);
+    __Pyx_GIVEREF(__pyx_3);
+    PyList_SET_ITEM(__pyx_t_3, 2, __pyx_1);
+    __Pyx_GIVEREF(__pyx_1);
+    __pyx_2 = 0;
+    __pyx_3 = 0;
+    __pyx_1 = 0;
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 989; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":990
+ * 
+ *         assert_dtype(src, [UINT8, INT8, FLOAT32])
+ *         assert_nchannels(src, [1, 3])             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *         if in_place:
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   PyMem_Free(__pyx_v_cv_kernel);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":973
  *     PyMem_Free(cv_kernel)
+=======
+    __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+    __Pyx_INCREF(__pyx_int_1);
+    PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_1);
+    __Pyx_GIVEREF(__pyx_int_1);
+    __Pyx_INCREF(__pyx_int_3);
+    PyList_SET_ITEM(__pyx_t_3, 1, __pyx_int_3);
+    __Pyx_GIVEREF(__pyx_int_3);
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 990; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":992
+ *         assert_nchannels(src, [1, 3])
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- *     if in_place:             # <<<<<<<<<<<<<<
- *         return None
- *     else:
+ *         if in_place:             # <<<<<<<<<<<<<<
+ *             out = src
+ *         elif out is not None:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 973; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_3) {
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":974
+=======
+    __pyx_t_6 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_in_place)); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 992; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (__pyx_t_6) {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":993
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- *     if in_place:
- *         return None             # <<<<<<<<<<<<<<
- *     else:
- *         return out
+ *         if in_place:
+ *             out = src             # <<<<<<<<<<<<<<
+ *         elif out is not None:
+ *             assert_like(src, out)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __Pyx_XDECREF(__pyx_r);
     __Pyx_INCREF(Py_None);
     __pyx_r = Py_None;
@@ -8257,24 +12915,226 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject
 
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":976
  *         return None
- *     else:
- *         return out             # <<<<<<<<<<<<<<
- * 
- * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False):
+=======
+      __Pyx_INCREF(((PyObject *)__pyx_v_src));
+      __Pyx_DECREF(((PyObject *)__pyx_v_out));
+      __pyx_v_out = __pyx_v_src;
+      goto __pyx_L12;
+    }
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":994
+ *         if in_place:
+ *             out = src
+ *         elif out is not None:             # <<<<<<<<<<<<<<
+ *             assert_like(src, out)
+ *         else:
  */
-    __Pyx_XDECREF(__pyx_r);
-    __Pyx_INCREF(((PyObject *)__pyx_v_out));
-    __pyx_r = ((PyObject *)__pyx_v_out);
-    goto __pyx_L0;
+    __pyx_t_6 = (((PyObject *)__pyx_v_out) != Py_None);
+    if (__pyx_t_6) {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":995
+ *             out = src
+ *         elif out is not None:
+ *             assert_like(src, out)             # <<<<<<<<<<<<<<
+ *         else:
+ *             out = new_array_like(src)
+ */
+      __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 995; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      goto __pyx_L12;
+    }
+    /*else*/ {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":997
+ *             assert_like(src, out)
+ *         else:
+ *             out = new_array_like(src)             # <<<<<<<<<<<<<<
+ * 
+ *     # CV_MEDIAN and CV_BILATERAL
+ */
+      __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 997; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_3);
+      __Pyx_DECREF(((PyObject *)__pyx_v_out));
+      __pyx_v_out = ((PyArrayObject *)__pyx_t_3);
+      __pyx_t_3 = 0;
+    }
+    __pyx_L12:;
+    goto __pyx_L7;
   }
+  /*else*/ {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1001
+ *     # CV_MEDIAN and CV_BILATERAL
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ *     else:
+ *         assert_dtype(src, [UINT8, INT8])             # <<<<<<<<<<<<<<
+ *         assert_nchannels(src, [1, 3])
+ * 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+ * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False):
+=======
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ */
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_2);
+    __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_140); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_3);
+    __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+    PyList_SET_ITEM(__pyx_t_3, 0, __pyx_2);
+    __Pyx_GIVEREF(__pyx_2);
+    PyList_SET_ITEM(__pyx_t_3, 1, __pyx_3);
+    __Pyx_GIVEREF(__pyx_3);
+    __pyx_2 = 0;
+    __pyx_3 = 0;
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1001; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1002
+ *     else:
+ *         assert_dtype(src, [UINT8, INT8])
+ *         assert_nchannels(src, [1, 3])             # <<<<<<<<<<<<<<
+ * 
+ *         if in_place:
+ */
+    __pyx_t_3 = PyList_New(2); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1002; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+    __Pyx_INCREF(__pyx_int_1);
+    PyList_SET_ITEM(__pyx_t_3, 0, __pyx_int_1);
+    __Pyx_GIVEREF(__pyx_int_1);
+    __Pyx_INCREF(__pyx_int_3);
+    PyList_SET_ITEM(__pyx_t_3, 1, __pyx_int_3);
+    __Pyx_GIVEREF(__pyx_int_3);
+    __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_3)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1002; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1004
+ *         assert_nchannels(src, [1, 3])
+ * 
+ *         if in_place:             # <<<<<<<<<<<<<<
+ *             raise RuntimeError('In place operation not supported with this '
+ *                                'filter')
+ */
+    __pyx_t_6 = __Pyx_PyObject_IsTrue(((PyObject *)__pyx_v_in_place)); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (__pyx_t_6) {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1005
+ * 
+ *         if in_place:
+ *             raise RuntimeError('In place operation not supported with this '             # <<<<<<<<<<<<<<
+ *                                'filter')
+ * 
+ */
+      __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1005; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+      __Pyx_INCREF(__pyx_kp_161);
+      PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_kp_161);
+      __Pyx_GIVEREF(__pyx_kp_161);
+      __pyx_t_4 = PyObject_Call(__pyx_builtin_RuntimeError, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1005; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_4);
+      __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+      __Pyx_Raise(__pyx_t_4, 0, 0);
+      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1005; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      goto __pyx_L13;
+    }
+    __pyx_L13:;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1008
+ *                                'filter')
+ * 
+ *         if out is not None:             # <<<<<<<<<<<<<<
+ *             assert_like(src, out)
+ *         else:
+ */
+    __pyx_t_6 = (((PyObject *)__pyx_v_out) != Py_None);
+    if (__pyx_t_6) {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1009
+ * 
+ *         if out is not None:
+ *             assert_like(src, out)             # <<<<<<<<<<<<<<
+ *         else:
+ *             out = new_array_like(src)
+ */
+      __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like(__pyx_v_src, __pyx_v_out); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1009; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      goto __pyx_L14;
+    }
+    /*else*/ {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1011
+ *             assert_like(src, out)
+ *         else:
+ *             out = new_array_like(src)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef IplImage srcimg
+ */
+      __pyx_t_4 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1011; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+      __Pyx_GOTREF(__pyx_t_4);
+      __Pyx_DECREF(((PyObject *)__pyx_v_out));
+      __pyx_v_out = ((PyArrayObject *)__pyx_t_4);
+      __pyx_t_4 = 0;
+    }
+    __pyx_L14:;
+  }
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_L8:;
+=======
+  __pyx_L7:;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1015
+ *     cdef IplImage srcimg
+ *     cdef IplImage outimg
+ *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(out, &outimg)
+ * 
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1016
+ *     cdef IplImage outimg
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
+ * 
+ *     c_cvSmooth(&srcimg, &outimg, smoothtype, param1, param2, param3, param4)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1018
+ *     populate_iplimage(out, &outimg)
+ * 
+ *     c_cvSmooth(&srcimg, &outimg, smoothtype, param1, param2, param3, param4)             # <<<<<<<<<<<<<<
+ * 
+ *     return out
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSmooth((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_smoothtype, __pyx_v_param1, __pyx_v_param2, __pyx_v_param3, __pyx_v_param4);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1020
+ *     c_cvSmooth(&srcimg, &outimg, smoothtype, param1, param2, param3, param4)
+ * 
+ *     return out             # <<<<<<<<<<<<<<
+ * 
+ * def cvFilter2D(np.ndarray src, np.ndarray kernel, anchor=None, in_place=False):
+ */
+  __Pyx_XDECREF(__pyx_r);
+  __Pyx_INCREF(((PyObject *)__pyx_v_out));
+  __pyx_r = ((PyObject *)__pyx_v_out);
+  goto __pyx_L0;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 
   __pyx_r = Py_None; __Pyx_INCREF(Py_None);
   goto __pyx_L0;
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_1);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_XDECREF(__pyx_t_2);
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvFilter2D");
+=======
+  __Pyx_XDECREF(__pyx_2);
+  __Pyx_XDECREF(__pyx_3);
+  __Pyx_XDECREF(__pyx_t_3);
+  __Pyx_XDECREF(__pyx_t_4);
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvSmooth");
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_r = NULL;
   __pyx_L0:;
   __Pyx_DECREF((PyObject *)__pyx_v_out);
@@ -8283,8 +13143,13 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D(PyObject
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":978
  *         return out
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1022
+ *     return out
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False):             # <<<<<<<<<<<<<<
  * 
@@ -8321,9 +13186,15 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
   __pyx_self = __pyx_self;
   if (unlikely(__pyx_kwds)) {
     Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     PyObject* values[3] = {0,0,0};
     values[1] = __pyx_k_60;
     values[2] = __pyx_k_61;
+=======
+    PyObject* values[4] = {0,0,0,0};
+    values[2] = Py_None;
+    values[3] = __pyx_k_134;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
       case  2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
@@ -8337,9 +13208,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
       if (likely(values[0])) kw_args--;
       else goto __pyx_L5_argtuple_error;
       case  1:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (kw_args > 0) {
         PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_square_sum);
         if (unlikely(value)) { values[1] = value; kw_args--; }
+=======
+      values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_kernel);
+      if (likely(values[1])) kw_args--;
+      else {
+        __Pyx_RaiseArgtupleInvalid("cvFilter2D", 0, 2, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
       }
       case  2:
       if (kw_args > 0) {
@@ -8348,14 +13226,23 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
       }
     }
     if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvIntegral") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFilter2D") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     __pyx_v_square_sum = values[1];
     __pyx_v_tilted_sum = values[2];
   } else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_v_square_sum = __pyx_k_60;
     __pyx_v_tilted_sum = __pyx_k_61;
+=======
+    __pyx_v_anchor = Py_None;
+    __pyx_v_in_place = __pyx_k_134;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  3: __pyx_v_tilted_sum = PyTuple_GET_ITEM(__pyx_args, 2);
       case  2: __pyx_v_square_sum = PyTuple_GET_ITEM(__pyx_args, 1);
@@ -8366,11 +13253,16 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvIntegral", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+  __Pyx_RaiseArgtupleInvalid("cvFilter2D", 0, 2, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvIntegral");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_v_out = Py_None; __Pyx_INCREF(Py_None);
   __pyx_v_outsum = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
   __pyx_v_outsqsum = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
@@ -8379,20 +13271,35 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":980
  * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False):
+=======
+  __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_kernel), __pyx_ptype_5numpy_ndarray, 1, "kernel", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1024
+ * def cvFilter2D(np.ndarray src, np.ndarray kernel, anchor=None, in_place=False):
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  *     assert_dtype(src, [UINT8, FLOAT32, FLOAT64])
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 980; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":981
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1024; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1025
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     validate_array(src)
  *     assert_dtype(src, [UINT8, FLOAT32, FLOAT64])             # <<<<<<<<<<<<<<
  * 
  *     out = []
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 981; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -8415,11 +13322,18 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":983
  *     assert_dtype(src, [UINT8, FLOAT32, FLOAT64])
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_kernel); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1025; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1027
+ *     validate_array(kernel)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     out = []             # <<<<<<<<<<<<<<
  * 
  *     cdef np.ndarray outsum
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 983; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_DECREF(__pyx_v_out);
@@ -8431,6 +13345,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
  *     cdef IplImage outtiltsumimg
  *     cdef IplImage* outsqsumimgptr = &outsqsumimg             # <<<<<<<<<<<<<<
  *     cdef IplImage* outtiltsumimgptr = &outtiltsumimg
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_kernel, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1027; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1028
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  */
   __pyx_v_outsqsumimgptr = (&__pyx_v_outsqsumimg);
@@ -8442,10 +13367,24 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
  * 
  *     populate_iplimage(src, &srcimg)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_v_outtiltsumimgptr = (&__pyx_v_outtiltsumimg);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":996
  *     cdef IplImage* outtiltsumimgptr = &outtiltsumimg
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1028; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1028; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
+  __Pyx_GIVEREF(__pyx_1);
+  __pyx_1 = 0;
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_kernel, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1028; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1031
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
  * 
@@ -8453,6 +13392,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":999
  * 
  *     # out arrays need to be (H + 1) x (W + 1)
@@ -8486,14 +13426,71 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
  *     cdef int out_dims = src.ndim             # <<<<<<<<<<<<<<
  * 
  *     if src.dtype == UINT8:
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1032
+ *     cdef CvPoint cv_anchor
+ *     if anchor is not None:
+ *         assert len(anchor) == 2, 'anchor must be (x, y) tuple'             # <<<<<<<<<<<<<<
+ *         cv_anchor.x = <int>anchor[0]
+ *         cv_anchor.y = <int>anchor[1]
+ */
+    #ifndef PYREX_WITHOUT_ASSERTIONS
+    __pyx_t_4 = PyObject_Length(__pyx_v_anchor); if (unlikely(__pyx_t_4 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (unlikely(!(__pyx_t_4 == 2))) {
+      PyErr_SetObject(PyExc_AssertionError, __pyx_kp_162);
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    }
+    #endif
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1033
+ *     if anchor is not None:
+ *         assert len(anchor) == 2, 'anchor must be (x, y) tuple'
+ *         cv_anchor.x = <int>anchor[0]             # <<<<<<<<<<<<<<
+ *         cv_anchor.y = <int>anchor[1]
+ *         assert (cv_anchor.x < kernel.shape[1]) and (cv_anchor.x >= 0) \
+ */
+    __pyx_1 = __Pyx_GetItemInt(__pyx_v_anchor, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_v_cv_anchor.x = ((int)__pyx_t_1);
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1034
+ *         assert len(anchor) == 2, 'anchor must be (x, y) tuple'
+ *         cv_anchor.x = <int>anchor[0]
+ *         cv_anchor.y = <int>anchor[1]             # <<<<<<<<<<<<<<
+ *         assert (cv_anchor.x < kernel.shape[1]) and (cv_anchor.x >= 0) \
+ *             and (cv_anchor.y < kernel.shape[0]) and (cv_anchor.y >= 0), \
+ */
+    __pyx_1 = __Pyx_GetItemInt(__pyx_v_anchor, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1034; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __pyx_v_cv_anchor.y = ((int)__pyx_t_1);
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1035
+ *         cv_anchor.x = <int>anchor[0]
+ *         cv_anchor.y = <int>anchor[1]
+ *         assert (cv_anchor.x < kernel.shape[1]) and (cv_anchor.x >= 0) \             # <<<<<<<<<<<<<<
+ *             and (cv_anchor.y < kernel.shape[0]) and (cv_anchor.y >= 0), \
+ *             'anchor point must be inside kernel'
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
   __pyx_v_out_dims = __pyx_v_src->nd;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1004
  *     cdef int out_dims = src.ndim
  * 
  *     if src.dtype == UINT8:             # <<<<<<<<<<<<<<
  *         outsum = new_array(out_dims, out_shape, INT32)
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1036
+ *         cv_anchor.y = <int>anchor[1]
+ *         assert (cv_anchor.x < kernel.shape[1]) and (cv_anchor.x >= 0) \
+ *             and (cv_anchor.y < kernel.shape[0]) and (cv_anchor.y >= 0), \             # <<<<<<<<<<<<<<
+ *             'anchor point must be inside kernel'
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     else:
  */
   __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1004; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -8508,6 +13505,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1005
  * 
  *     if src.dtype == UINT8:
@@ -8523,12 +13521,30 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
     __Pyx_DECREF(((PyObject *)__pyx_v_outsum));
     __pyx_v_outsum = ((PyArrayObject *)__pyx_t_3);
     __pyx_t_3 = 0;
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1037
+ *         assert (cv_anchor.x < kernel.shape[1]) and (cv_anchor.x >= 0) \
+ *             and (cv_anchor.y < kernel.shape[0]) and (cv_anchor.y >= 0), \
+ *             'anchor point must be inside kernel'             # <<<<<<<<<<<<<<
+ *     else:
+ *         cv_anchor.x = <int>(kernel.shape[1] / 2.)
+ */
+      PyErr_SetObject(PyExc_AssertionError, __pyx_kp_163);
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1035; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    }
+    #endif
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
     goto __pyx_L6;
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1007
  *         outsum = new_array(out_dims, out_shape, INT32)
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1039
+ *             'anchor point must be inside kernel'
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     else:
  *         outsum = new_array(out_dims, out_shape, FLOAT64)             # <<<<<<<<<<<<<<
  * 
@@ -8545,28 +13561,47 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
   }
   __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1009
  *         outsum = new_array(out_dims, out_shape, FLOAT64)
  * 
  *     populate_iplimage(outsum, &outsumimg)             # <<<<<<<<<<<<<<
  *     out.append(outsum)
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1040
+ *     else:
+ *         cv_anchor.x = <int>(kernel.shape[1] / 2.)
+ *         cv_anchor.y = <int>(kernel.shape[0] / 2.)             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_outsum, (&__pyx_v_outsumimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1010
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1044
+ *     cdef np.ndarray out
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     populate_iplimage(outsum, &outsumimg)
  *     out.append(outsum)             # <<<<<<<<<<<<<<
  * 
  *     if square_sum:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = __Pyx_PyObject_Append(__pyx_v_out, ((PyObject *)__pyx_v_outsum)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1010; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1012
  *     out.append(outsum)
+=======
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1044; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_3) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1045
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if square_sum:             # <<<<<<<<<<<<<<
  *         outsqsum = new_array(out_dims, out_shape, FLOAT64)
@@ -8614,13 +13649,19 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1017
  *         out.append(outsqsum)
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1047
+ *         out = src
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     else:
  *         outsqsumimgptr = NULL             # <<<<<<<<<<<<<<
  * 
  *     if tilted_sum:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     __pyx_v_outsqsumimgptr = NULL;
   }
   __pyx_L7:;
@@ -8631,11 +13672,35 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
  *     if tilted_sum:             # <<<<<<<<<<<<<<
  *         outtiltsum = new_array(out_dims, out_shape, outsum.dtype)
  *         populate_iplimage(outtiltsum, &outtiltsumimg)
+=======
+    __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like(__pyx_v_src)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1047; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(((PyObject *)__pyx_v_out));
+    __pyx_v_out = ((PyArrayObject *)__pyx_t_2);
+    __pyx_t_2 = 0;
+  }
+  __pyx_L7:;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1052
+ *     cdef IplImage outimg
+ *     cdef IplImage kernelimg
+ *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(out, &outimg)
+ *     populate_iplimage(kernel, &kernelimg)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
   __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_tilted_sum); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1019; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1020
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1053
+ *     cdef IplImage kernelimg
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(kernel, &kernelimg)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     if tilted_sum:
  *         outtiltsum = new_array(out_dims, out_shape, outsum.dtype)             # <<<<<<<<<<<<<<
@@ -8651,21 +13716,39 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
     __pyx_v_outtiltsum = ((PyArrayObject *)__pyx_t_2);
     __pyx_t_2 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1021
  *     if tilted_sum:
  *         outtiltsum = new_array(out_dims, out_shape, outsum.dtype)
  *         populate_iplimage(outtiltsum, &outtiltsumimg)             # <<<<<<<<<<<<<<
  *         out.append(outtiltsum)
  *     else:
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1054
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)
+ *     populate_iplimage(kernel, &kernelimg)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef CvMat* cv_kernel
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
     __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_outtiltsum, (&__pyx_v_outtiltsumimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1022
  *         outtiltsum = new_array(out_dims, out_shape, outsum.dtype)
  *         populate_iplimage(outtiltsum, &outtiltsumimg)
  *         out.append(outtiltsum)             # <<<<<<<<<<<<<<
  *     else:
  *         outtiltsumimgptr = NULL
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1057
+ * 
+ *     cdef CvMat* cv_kernel
+ *     cv_kernel = cvmat_ptr_from_iplimage(&kernelimg)             # <<<<<<<<<<<<<<
+ * 
+ *     c_cvFilter2D(&srcimg, &outimg, cv_kernel, cv_anchor)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
     __pyx_t_2 = __Pyx_PyObject_Append(__pyx_v_out, ((PyObject *)__pyx_v_outtiltsum)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_2);
@@ -8674,10 +13757,17 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
   }
   /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
     /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1024
  *         out.append(outtiltsum)
  *     else:
  *         outtiltsumimgptr = NULL             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1059
+ *     cv_kernel = cvmat_ptr_from_iplimage(&kernelimg)
+ * 
+ *     c_cvFilter2D(&srcimg, &outimg, cv_kernel, cv_anchor)             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     c_cvIntegral(&srcimg, &outsumimg, outsqsumimgptr, outtiltsumimgptr)
  */
@@ -8685,8 +13775,13 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
   }
   __pyx_L8:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1026
  *         outtiltsumimgptr = NULL
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1061
+ *     c_cvFilter2D(&srcimg, &outimg, cv_kernel, cv_anchor)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     c_cvIntegral(&srcimg, &outsumimg, outsqsumimgptr, outtiltsumimgptr)             # <<<<<<<<<<<<<<
  * 
@@ -8694,21 +13789,44 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
  */
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvIntegral((&__pyx_v_srcimg), (&__pyx_v_outsumimg), __pyx_v_outsqsumimgptr, __pyx_v_outtiltsumimgptr);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1028
  *     c_cvIntegral(&srcimg, &outsumimg, outsqsumimgptr, outtiltsumimgptr)
  * 
  *     PyMem_Free(out_shape)             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1063
+ *     PyMem_Free(cv_kernel)
+ * 
+ *     if in_place:             # <<<<<<<<<<<<<<
+ *         return None
+ *     else:
+ */
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1063; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_3) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1064
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  *     return out
  */
   PyMem_Free(__pyx_v_out_shape);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1030
  *     PyMem_Free(out_shape)
  * 
  *     return out             # <<<<<<<<<<<<<<
  * 
  * def cvCalibrateCamera2(np.ndarray object_points, np.ndarray image_points,
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1066
+ *         return None
+ *     else:
+ *         return out             # <<<<<<<<<<<<<<
+ * 
+ * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False):
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
   __Pyx_XDECREF(__pyx_r);
   __Pyx_INCREF(__pyx_v_out);
@@ -8735,47 +13853,53 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject
   return __pyx_r;
 }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
 /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1032
  *     return out
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1068
+ *         return out
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- * def cvCalibrateCamera2(np.ndarray object_points, np.ndarray image_points,             # <<<<<<<<<<<<<<
- *            np.ndarray point_counts, image_size):
+ * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False):             # <<<<<<<<<<<<<<
  * 
+ *     validate_array(src)
  */
 
-static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
-static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
-  PyArrayObject *__pyx_v_object_points = 0;
-  PyArrayObject *__pyx_v_image_points = 0;
-  PyArrayObject *__pyx_v_point_counts = 0;
-  PyObject *__pyx_v_image_size = 0;
-  npy_intp __pyx_v_intrinsics_shape[2];
-  PyArrayObject *__pyx_v_intrinsics = 0;
-  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_ipl_intrinsics;
-  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmat_intrinsics;
-  npy_intp __pyx_v_distortion_shape[2];
-  PyArrayObject *__pyx_v_distortion = 0;
-  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_ipl_distortion;
-  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmat_distortion;
-  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_ipl_object_points;
-  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_ipl_image_points;
-  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_ipl_point_counts;
-  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmat_object_points;
-  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmat_image_points;
-  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmat_point_counts;
-  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize __pyx_v_cv_image_size;
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+  PyArrayObject *__pyx_v_src = 0;
+  PyObject *__pyx_v_square_sum = 0;
+  PyObject *__pyx_v_tilted_sum = 0;
+  PyObject *__pyx_v_out;
+  PyArrayObject *__pyx_v_outsum;
+  PyArrayObject *__pyx_v_outsqsum;
+  PyArrayObject *__pyx_v_outtiltsum;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outsumimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outsqsumimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outtiltsumimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *__pyx_v_outsqsumimgptr;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *__pyx_v_outtiltsumimgptr;
+  npy_intp *__pyx_v_out_shape;
+  int __pyx_v_out_dims;
   PyObject *__pyx_r = NULL;
   PyObject *__pyx_1 = 0;
+  PyObject *__pyx_2 = 0;
+  PyObject *__pyx_3 = 0;
   int __pyx_t_1;
   PyObject *__pyx_t_2 = NULL;
-  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_object_points,&__pyx_kp_image_points,&__pyx_kp_point_counts,&__pyx_kp_image_size,0};
-  __Pyx_SetupRefcountContext("cvCalibrateCamera2");
+  PyObject *__pyx_t_3 = NULL;
+  int __pyx_t_4;
+  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_square_sum,&__pyx_kp_tilted_sum,0};
+  __Pyx_SetupRefcountContext("cvIntegral");
   __pyx_self = __pyx_self;
   if (unlikely(__pyx_kwds)) {
     Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
-    PyObject* values[4] = {0,0,0,0};
+    PyObject* values[3] = {0,0,0};
+    values[1] = __pyx_k_135;
+    values[2] = __pyx_k_136;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
-      case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
       case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
       case  2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
       case  1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
@@ -8784,10 +13908,11 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
     }
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  0:
-      values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_object_points);
+      values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_src);
       if (likely(values[0])) kw_args--;
       else goto __pyx_L5_argtuple_error;
       case  1:
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
       values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_image_points);
       if (likely(values[1])) kw_args--;
       else {
@@ -8808,26 +13933,47 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
     }
     if (unlikely(kw_args > 0)) {
       if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCalibrateCamera2") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_square_sum);
+        if (unlikely(value)) { values[1] = value; kw_args--; }
+      }
+      case  2:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_tilted_sum);
+        if (unlikely(value)) { values[2] = value; kw_args--; }
+      }
     }
-    __pyx_v_object_points = ((PyArrayObject *)values[0]);
-    __pyx_v_image_points = ((PyArrayObject *)values[1]);
-    __pyx_v_point_counts = ((PyArrayObject *)values[2]);
-    __pyx_v_image_size = values[3];
-  } else if (PyTuple_GET_SIZE(__pyx_args) != 4) {
-    goto __pyx_L5_argtuple_error;
+    if (unlikely(kw_args > 0)) {
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvIntegral") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_square_sum = values[1];
+    __pyx_v_tilted_sum = values[2];
   } else {
-    __pyx_v_object_points = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
-    __pyx_v_image_points = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
-    __pyx_v_point_counts = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 2));
-    __pyx_v_image_size = PyTuple_GET_ITEM(__pyx_args, 3);
+    __pyx_v_square_sum = __pyx_k_135;
+    __pyx_v_tilted_sum = __pyx_k_136;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  3: __pyx_v_tilted_sum = PyTuple_GET_ITEM(__pyx_args, 2);
+      case  2: __pyx_v_square_sum = PyTuple_GET_ITEM(__pyx_args, 1);
+      case  1: __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+      break;
+      default: goto __pyx_L5_argtuple_error;
+    }
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+  __Pyx_RaiseArgtupleInvalid("cvIntegral", 0, 1, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_L3_error:;
-  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCalibrateCamera2");
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvIntegral");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_object_points), __pyx_ptype_5numpy_ndarray, 1, "object_points", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_image_points), __pyx_ptype_5numpy_ndarray, 1, "image_points", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1032; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_point_counts), __pyx_ptype_5numpy_ndarray, 1, "point_counts", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1033; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -8866,12 +14012,22 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_image_points); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1039; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1040
+=======
+  __pyx_v_out = Py_None; __Pyx_INCREF(Py_None);
+  __pyx_v_outsum = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  __pyx_v_outsqsum = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  __pyx_v_outtiltsum = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1070
+ * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False):
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- *     validate_array(image_points)
- *     assert_ndims(image_points, [2])             # <<<<<<<<<<<<<<
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+ *     assert_dtype(src, [UINT8, FLOAT32, FLOAT64])
  * 
- *     assert_dtype(point_counts, [INT32])
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1040; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_2);
@@ -8882,28 +14038,58 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1042
  *     assert_ndims(image_points, [2])
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1070; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1071
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- *     assert_dtype(point_counts, [INT32])             # <<<<<<<<<<<<<<
- *     assert_ndims(point_counts, [1])
+ *     validate_array(src)
+ *     assert_dtype(src, [UINT8, FLOAT32, FLOAT64])             # <<<<<<<<<<<<<<
  * 
+ *     out = []
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_92); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1042; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1042; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_164); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
   __pyx_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_point_counts, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1042; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1043
+=======
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1071; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1073
+ *     assert_dtype(src, [UINT8, FLOAT32, FLOAT64])
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- *     assert_dtype(point_counts, [INT32])
- *     assert_ndims(point_counts, [1])             # <<<<<<<<<<<<<<
+ *     out = []             # <<<<<<<<<<<<<<
  * 
- *     # Allocate a new intrinsics array
+ *     cdef np.ndarray outsum
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1043; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
@@ -8918,18 +14104,42 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
  *     intrinsics_shape[0] = <np.npy_intp> 3             # <<<<<<<<<<<<<<
  *     intrinsics_shape[1] = <np.npy_intp> 3
  *     cdef np.ndarray intrinsics = new_array(2, intrinsics_shape, FLOAT64)
- */
-  (__pyx_v_intrinsics_shape[0]) = ((npy_intp)3);
+=======
+  __pyx_t_2 = PyList_New(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1073; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_DECREF(__pyx_v_out);
+  __pyx_v_out = ((PyObject *)__pyx_t_2);
+  __pyx_t_2 = 0;
 
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1083
+ *     cdef IplImage outsqsumimg
+ *     cdef IplImage outtiltsumimg
+ *     cdef IplImage* outsqsumimgptr = &outsqsumimg             # <<<<<<<<<<<<<<
+ *     cdef IplImage* outtiltsumimgptr = &outtiltsumimg
+ * 
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ */
+  __pyx_v_outsqsumimgptr = (&__pyx_v_outsqsumimg);
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1048
  *     cdef np.npy_intp intrinsics_shape[2]
  *     intrinsics_shape[0] = <np.npy_intp> 3
  *     intrinsics_shape[1] = <np.npy_intp> 3             # <<<<<<<<<<<<<<
  *     cdef np.ndarray intrinsics = new_array(2, intrinsics_shape, FLOAT64)
  *     cdef IplImage ipl_intrinsics
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1084
+ *     cdef IplImage outtiltsumimg
+ *     cdef IplImage* outsqsumimgptr = &outsqsumimg
+ *     cdef IplImage* outtiltsumimgptr = &outtiltsumimg             # <<<<<<<<<<<<<<
+ * 
+ *     populate_iplimage(src, &srcimg)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
-  (__pyx_v_intrinsics_shape[1]) = ((npy_intp)3);
+  __pyx_v_outtiltsumimgptr = (&__pyx_v_outtiltsumimg);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1049
  *     intrinsics_shape[0] = <np.npy_intp> 3
  *     intrinsics_shape[1] = <np.npy_intp> 3
@@ -8950,28 +14160,63 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
  *     cdef IplImage ipl_intrinsics
  *     populate_iplimage(intrinsics, &ipl_intrinsics)             # <<<<<<<<<<<<<<
  *     cdef CvMat* cvmat_intrinsics = cvmat_ptr_from_iplimage(&ipl_intrinsics)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1086
+ *     cdef IplImage* outtiltsumimgptr = &outtiltsumimg
  * 
+ *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
+ * 
+ *     # out arrays need to be (H + 1) x (W + 1)
  */
-  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_intrinsics, (&__pyx_v_ipl_intrinsics));
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1089
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     # out arrays need to be (H + 1) x (W + 1)
+ *     cdef np.npy_intp* out_shape = clone_array_shape(src)             # <<<<<<<<<<<<<<
+ *     out_shape[0] = src.shape[0] + 1
+ *     out_shape[1] = src.shape[1] + 1
+ */
+  __pyx_v_out_shape = __pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_shape(__pyx_v_src);
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1052
  *     cdef IplImage ipl_intrinsics
  *     populate_iplimage(intrinsics, &ipl_intrinsics)
  *     cdef CvMat* cvmat_intrinsics = cvmat_ptr_from_iplimage(&ipl_intrinsics)             # <<<<<<<<<<<<<<
  * 
  *     # Allocate a new distortion array
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1090
+ *     # out arrays need to be (H + 1) x (W + 1)
+ *     cdef np.npy_intp* out_shape = clone_array_shape(src)
+ *     out_shape[0] = src.shape[0] + 1             # <<<<<<<<<<<<<<
+ *     out_shape[1] = src.shape[1] + 1
+ *     cdef int out_dims = src.ndim
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
-  __pyx_v_cvmat_intrinsics = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_intrinsics));
+  (__pyx_v_out_shape[0]) = ((__pyx_v_src->dimensions[0]) + 1);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1056
  *     # Allocate a new distortion array
  *     cdef np.npy_intp distortion_shape[2]
  *     distortion_shape[0] = <np.npy_intp> 1             # <<<<<<<<<<<<<<
  *     distortion_shape[1] = <np.npy_intp> 4
  *     cdef np.ndarray distortion = new_array(2, distortion_shape, FLOAT64)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1091
+ *     cdef np.npy_intp* out_shape = clone_array_shape(src)
+ *     out_shape[0] = src.shape[0] + 1
+ *     out_shape[1] = src.shape[1] + 1             # <<<<<<<<<<<<<<
+ *     cdef int out_dims = src.ndim
+ * 
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
-  (__pyx_v_distortion_shape[0]) = ((npy_intp)1);
+  (__pyx_v_out_shape[1]) = ((__pyx_v_src->dimensions[1]) + 1);
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1057
  *     cdef np.npy_intp distortion_shape[2]
  *     distortion_shape[0] = <np.npy_intp> 1
@@ -8991,90 +14236,220 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_91); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1058; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_distortion_shape, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1058; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __Pyx_GOTREF(__pyx_t_2);
-  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_v_distortion = ((PyArrayObject *)__pyx_t_2);
-  __pyx_t_2 = 0;
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1092
+ *     out_shape[0] = src.shape[0] + 1
+ *     out_shape[1] = src.shape[1] + 1
+ *     cdef int out_dims = src.ndim             # <<<<<<<<<<<<<<
+ * 
+ *     if src.dtype == UINT8:
+ */
+  __pyx_v_out_dims = __pyx_v_src->nd;
 
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1094
+ *     cdef int out_dims = src.ndim
+ * 
+ *     if src.dtype == UINT8:             # <<<<<<<<<<<<<<
+ *         outsum = new_array(out_dims, out_shape, INT32)
+ *     else:
+ */
+  __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1094; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1094; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_3 = PyObject_RichCompare(__pyx_t_2, __pyx_1, Py_EQ); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1094; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1094; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  if (__pyx_t_4) {
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1060
  *     cdef np.ndarray distortion = new_array(2, distortion_shape, FLOAT64)
  *     cdef IplImage ipl_distortion
  *     populate_iplimage(distortion, &ipl_distortion)             # <<<<<<<<<<<<<<
  *     cdef CvMat* cvmat_distortion = cvmat_ptr_from_iplimage(&ipl_distortion)
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1095
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
+ *     if src.dtype == UINT8:
+ *         outsum = new_array(out_dims, out_shape, INT32)             # <<<<<<<<<<<<<<
+ *     else:
+ *         outsum = new_array(out_dims, out_shape, FLOAT64)
  */
-  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_distortion, (&__pyx_v_ipl_distortion));
+    __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_165); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_2);
+    __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_2)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
+    __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+    __Pyx_DECREF(((PyObject *)__pyx_v_outsum));
+    __pyx_v_outsum = ((PyArrayObject *)__pyx_t_3);
+    __pyx_t_3 = 0;
+    goto __pyx_L6;
+  }
+  /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1061
  *     cdef IplImage ipl_distortion
  *     populate_iplimage(distortion, &ipl_distortion)
  *     cdef CvMat* cvmat_distortion = cvmat_ptr_from_iplimage(&ipl_distortion)             # <<<<<<<<<<<<<<
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1097
+ *         outsum = new_array(out_dims, out_shape, INT32)
+ *     else:
+ *         outsum = new_array(out_dims, out_shape, FLOAT64)             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- *     # Make the object & image points & npoints accessible for OpenCV
+ *     populate_iplimage(outsum, &outsumimg)
  */
-  __pyx_v_cvmat_distortion = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_distortion));
+    __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_164); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_3);
+    __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_3)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1097; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
+    __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+    __Pyx_DECREF(((PyObject *)__pyx_v_outsum));
+    __pyx_v_outsum = ((PyArrayObject *)__pyx_t_3);
+    __pyx_t_3 = 0;
+  }
+  __pyx_L6:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1066
  *     cdef IplImage ipl_object_points, ipl_image_points, ipl_point_counts
  *     cdef CvMat* cvmat_object_points, *cvmat_image_points, *cvmat_point_counts
  *     populate_iplimage(object_points, &ipl_object_points)             # <<<<<<<<<<<<<<
  *     populate_iplimage(image_points, &ipl_image_points)
  *     populate_iplimage(point_counts, &ipl_point_counts)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1099
+ *         outsum = new_array(out_dims, out_shape, FLOAT64)
+ * 
+ *     populate_iplimage(outsum, &outsumimg)             # <<<<<<<<<<<<<<
+ *     out.append(outsum)
+ * 
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
-  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_object_points, (&__pyx_v_ipl_object_points));
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_outsum, (&__pyx_v_outsumimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1067
  *     cdef CvMat* cvmat_object_points, *cvmat_image_points, *cvmat_point_counts
  *     populate_iplimage(object_points, &ipl_object_points)
  *     populate_iplimage(image_points, &ipl_image_points)             # <<<<<<<<<<<<<<
  *     populate_iplimage(point_counts, &ipl_point_counts)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1100
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
+ *     populate_iplimage(outsum, &outsumimg)
+ *     out.append(outsum)             # <<<<<<<<<<<<<<
+ * 
+ *     if square_sum:
  */
-  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_image_points, (&__pyx_v_ipl_image_points));
+  __pyx_t_3 = __Pyx_PyObject_Append(__pyx_v_out, ((PyObject *)__pyx_v_outsum)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1100; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1068
  *     populate_iplimage(object_points, &ipl_object_points)
  *     populate_iplimage(image_points, &ipl_image_points)
  *     populate_iplimage(point_counts, &ipl_point_counts)             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1102
+ *     out.append(outsum)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- *     cvmat_object_points = cvmat_ptr_from_iplimage(&ipl_object_points)
+ *     if square_sum:             # <<<<<<<<<<<<<<
+ *         outsqsum = new_array(out_dims, out_shape, FLOAT64)
+ *         populate_iplimage(outsqsum, &outsqsumimg)
  */
-  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_point_counts, (&__pyx_v_ipl_point_counts));
+  __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_square_sum); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_4) {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1070
  *     populate_iplimage(point_counts, &ipl_point_counts)
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1103
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- *     cvmat_object_points = cvmat_ptr_from_iplimage(&ipl_object_points)             # <<<<<<<<<<<<<<
- *     cvmat_image_points = cvmat_ptr_from_iplimage(&ipl_image_points)
- *     cvmat_point_counts = cvmat_ptr_from_iplimage(&ipl_point_counts)
+ *     if square_sum:
+ *         outsqsum = new_array(out_dims, out_shape, FLOAT64)             # <<<<<<<<<<<<<<
+ *         populate_iplimage(outsqsum, &outsqsumimg)
+ *         out.append(outsqsum)
  */
-  __pyx_v_cvmat_object_points = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_object_points));
+    __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_164); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_1);
+    __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_1)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1103; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
+    __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+    __Pyx_DECREF(((PyObject *)__pyx_v_outsqsum));
+    __pyx_v_outsqsum = ((PyArrayObject *)__pyx_t_3);
+    __pyx_t_3 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1071
  * 
  *     cvmat_object_points = cvmat_ptr_from_iplimage(&ipl_object_points)
  *     cvmat_image_points = cvmat_ptr_from_iplimage(&ipl_image_points)             # <<<<<<<<<<<<<<
  *     cvmat_point_counts = cvmat_ptr_from_iplimage(&ipl_point_counts)
  * 
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1104
+ *     if square_sum:
+ *         outsqsum = new_array(out_dims, out_shape, FLOAT64)
+ *         populate_iplimage(outsqsum, &outsqsumimg)             # <<<<<<<<<<<<<<
+ *         out.append(outsqsum)
+ *     else:
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
-  __pyx_v_cvmat_image_points = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_image_points));
+    __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_outsqsum, (&__pyx_v_outsqsumimg));
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1072
  *     cvmat_object_points = cvmat_ptr_from_iplimage(&ipl_object_points)
  *     cvmat_image_points = cvmat_ptr_from_iplimage(&ipl_image_points)
  *     cvmat_point_counts = cvmat_ptr_from_iplimage(&ipl_point_counts)             # <<<<<<<<<<<<<<
  * 
  *     # Set image size
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1105
+ *         outsqsum = new_array(out_dims, out_shape, FLOAT64)
+ *         populate_iplimage(outsqsum, &outsqsumimg)
+ *         out.append(outsqsum)             # <<<<<<<<<<<<<<
+ *     else:
+ *         outsqsumimgptr = NULL
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
-  __pyx_v_cvmat_point_counts = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_point_counts));
+    __pyx_t_3 = __Pyx_PyObject_Append(__pyx_v_out, ((PyObject *)__pyx_v_outsqsum)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1105; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    goto __pyx_L7;
+  }
+  /*else*/ {
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1076
  *     # Set image size
  *     cdef CvSize cv_image_size
  *     cv_image_size.height = image_size[0]             # <<<<<<<<<<<<<<
  *     cv_image_size.width = image_size[1]
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1107
+ *         out.append(outsqsum)
+ *     else:
+ *         outsqsumimgptr = NULL             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
+ *     if tilted_sum:
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetItemInt(__pyx_v_image_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1076; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -9085,9 +14460,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
  *     cdef CvSize cv_image_size
  *     cv_image_size.height = image_size[0]
  *     cv_image_size.width = image_size[1]             # <<<<<<<<<<<<<<
+=======
+    __pyx_v_outsqsumimgptr = NULL;
+  }
+  __pyx_L7:;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1109
+ *         outsqsumimgptr = NULL
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- *     # Call the function
+ *     if tilted_sum:             # <<<<<<<<<<<<<<
+ *         outtiltsum = new_array(out_dims, out_shape, outsum.dtype)
+ *         populate_iplimage(outtiltsum, &outtiltsumimg)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetItemInt(__pyx_v_image_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1077; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -9098,11 +14484,28 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
  *     c_cvCalibrateCamera2(cvmat_object_points, cvmat_image_points,
  *                          cvmat_point_counts, cv_image_size, cvmat_intrinsics,
  *                          cvmat_distortion, NULL, NULL, 0)             # <<<<<<<<<<<<<<
- * 
- *     # Convert distortion back into a vector
- */
-  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCalibrateCamera2(__pyx_v_cvmat_object_points, __pyx_v_cvmat_image_points, __pyx_v_cvmat_point_counts, __pyx_v_cv_image_size, __pyx_v_cvmat_intrinsics, __pyx_v_cvmat_distortion, NULL, NULL, 0);
+=======
+  __pyx_t_4 = __Pyx_PyObject_IsTrue(__pyx_v_tilted_sum); if (unlikely(__pyx_t_4 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__pyx_t_4) {
 
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1110
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     if tilted_sum:
+ *         outtiltsum = new_array(out_dims, out_shape, outsum.dtype)             # <<<<<<<<<<<<<<
+ *         populate_iplimage(outtiltsum, &outtiltsumimg)
+ *         out.append(outtiltsum)
+ */
+    __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_outsum), __pyx_kp_dtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1110; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(__pyx_v_out_dims, __pyx_v_out_shape, __pyx_t_3)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1110; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __Pyx_DECREF(((PyObject *)__pyx_v_outtiltsum));
+    __pyx_v_outtiltsum = ((PyArrayObject *)__pyx_t_2);
+    __pyx_t_2 = 0;
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1085
  * 
  *     # Convert distortion back into a vector
@@ -9123,9 +14526,32 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
  *     PyMem_Free(cvmat_intrinsics)             # <<<<<<<<<<<<<<
  *     PyMem_Free(cvmat_distortion)
  *     PyMem_Free(cvmat_object_points)
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1111
+ *     if tilted_sum:
+ *         outtiltsum = new_array(out_dims, out_shape, outsum.dtype)
+ *         populate_iplimage(outtiltsum, &outtiltsumimg)             # <<<<<<<<<<<<<<
+ *         out.append(outtiltsum)
+ *     else:
  */
-  PyMem_Free(__pyx_v_cvmat_intrinsics);
+    __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_outtiltsum, (&__pyx_v_outtiltsumimg));
 
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1112
+ *         outtiltsum = new_array(out_dims, out_shape, outsum.dtype)
+ *         populate_iplimage(outtiltsum, &outtiltsumimg)
+ *         out.append(outtiltsum)             # <<<<<<<<<<<<<<
+ *     else:
+ *         outtiltsumimgptr = NULL
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ */
+    __pyx_t_2 = __Pyx_PyObject_Append(__pyx_v_out, ((PyObject *)__pyx_v_outtiltsum)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+    goto __pyx_L8;
+  }
+  /*else*/ {
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1088
  * 
  *     PyMem_Free(cvmat_intrinsics)
@@ -9141,19 +14567,1345 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
  *     PyMem_Free(cvmat_object_points)             # <<<<<<<<<<<<<<
  *     PyMem_Free(cvmat_image_points)
  *     PyMem_Free(cvmat_point_counts)
+=======
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1114
+ *         out.append(outtiltsum)
+ *     else:
+ *         outtiltsumimgptr = NULL             # <<<<<<<<<<<<<<
+ * 
+ *     c_cvIntegral(&srcimg, &outsumimg, outsqsumimgptr, outtiltsumimgptr)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  */
-  PyMem_Free(__pyx_v_cvmat_object_points);
+    __pyx_v_outtiltsumimgptr = NULL;
+  }
+  __pyx_L8:;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1090
  *     PyMem_Free(cvmat_distortion)
  *     PyMem_Free(cvmat_object_points)
  *     PyMem_Free(cvmat_image_points)             # <<<<<<<<<<<<<<
  *     PyMem_Free(cvmat_point_counts)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1116
+ *         outtiltsumimgptr = NULL
+ * 
+ *     c_cvIntegral(&srcimg, &outsumimg, outsqsumimgptr, outtiltsumimgptr)             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     PyMem_Free(out_shape)
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvIntegral((&__pyx_v_srcimg), (&__pyx_v_outsumimg), __pyx_v_outsqsumimgptr, __pyx_v_outtiltsumimgptr);
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1091
+ *     PyMem_Free(cvmat_object_points)
+ *     PyMem_Free(cvmat_image_points)
+ *     PyMem_Free(cvmat_point_counts)             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1118
+ *     c_cvIntegral(&srcimg, &outsumimg, outsqsumimgptr, outtiltsumimgptr)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     PyMem_Free(out_shape)             # <<<<<<<<<<<<<<
+ * 
+ *     return out
+ */
+  PyMem_Free(__pyx_v_out_shape);
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1093
+ *     PyMem_Free(cvmat_point_counts)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1120
+ *     PyMem_Free(out_shape)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     return out             # <<<<<<<<<<<<<<
+ * 
+ * def cvCvtColor(np.ndarray src, int code):
+ */
+  __Pyx_XDECREF(__pyx_r);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1093; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(((PyObject *)__pyx_v_intrinsics));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_intrinsics));
+  __Pyx_GIVEREF(((PyObject *)__pyx_v_intrinsics));
+  __Pyx_INCREF(((PyObject *)__pyx_v_distortion));
+  PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_distortion));
+  __Pyx_GIVEREF(((PyObject *)__pyx_v_distortion));
+  __pyx_r = ((PyObject *)__pyx_t_2);
+  __pyx_t_2 = 0;
+=======
+  __Pyx_INCREF(__pyx_v_out);
+  __pyx_r = __pyx_v_out;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  goto __pyx_L0;
+
+  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  goto __pyx_L0;
+  __pyx_L1_error:;
+  __Pyx_XDECREF(__pyx_1);
+  __Pyx_XDECREF(__pyx_2);
+  __Pyx_XDECREF(__pyx_3);
+  __Pyx_XDECREF(__pyx_t_2);
+  __Pyx_XDECREF(__pyx_t_3);
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvIntegral");
+  __pyx_r = NULL;
+  __pyx_L0:;
+  __Pyx_DECREF(__pyx_v_out);
+  __Pyx_DECREF((PyObject *)__pyx_v_outsum);
+  __Pyx_DECREF((PyObject *)__pyx_v_outsqsum);
+  __Pyx_DECREF((PyObject *)__pyx_v_outtiltsum);
+  __Pyx_XGIVEREF(__pyx_r);
+  __Pyx_FinishRefcountContext();
+  return __pyx_r;
+}
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1095
+ *     return intrinsics, distortion
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1122
+ *     return out
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ * def cvCvtColor(np.ndarray src, int code):             # <<<<<<<<<<<<<<
+ * 
+ *     validate_array(src)
+ */
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+  PyArrayObject *__pyx_v_src = 0;
+  int __pyx_v_code;
+  PyObject *__pyx_v_conversion_params;
+  int __pyx_v_src_channels;
+  int __pyx_v_out_channels;
+  PyObject *__pyx_v_src_dtypes;
+  PyArrayObject *__pyx_v_out;
+  npy_intp __pyx_v_out_shape2[2];
+  npy_intp __pyx_v_out_shape3[3];
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_srcimg;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_outimg;
+  PyObject *__pyx_r = NULL;
+  PyObject *__pyx_1 = 0;
+  PyObject *__pyx_2 = 0;
+  PyObject *__pyx_3 = 0;
+  int __pyx_4;
+  int __pyx_t_1;
+  PyObject *__pyx_t_2 = NULL;
+  PyObject *__pyx_t_3 = NULL;
+  PyObject *__pyx_t_4 = NULL;
+  int __pyx_t_5;
+  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_src,&__pyx_kp_code,0};
+  __Pyx_SetupRefcountContext("cvCvtColor");
+  __pyx_self = __pyx_self;
+  if (unlikely(__pyx_kwds)) {
+    Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+    PyObject* values[2] = {0,0};
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
+      case  1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
+      case  0: break;
+      default: goto __pyx_L5_argtuple_error;
+    }
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  0:
+      values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_src);
+      if (likely(values[0])) kw_args--;
+      else goto __pyx_L5_argtuple_error;
+      case  1:
+      values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_code);
+      if (likely(values[1])) kw_args--;
+      else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+        __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      }
+      case  2:
+      if (kw_args > 0) {
+        PyObject* value = PyDict_GetItem(__pyx_kwds, __pyx_kp_flags);
+        if (unlikely(value)) { values[2] = value; kw_args--; }
+      }
+    }
+    if (unlikely(kw_args > 0)) {
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFindChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_pattern_size = values[1];
+    if (values[2]) {
+      __pyx_v_flags = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    } else {
+      __pyx_v_flags = __pyx_k_63;
+    }
+  } else {
+    __pyx_v_flags = __pyx_k_63;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  3:
+      __pyx_v_flags = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      case  2:
+      __pyx_v_pattern_size = PyTuple_GET_ITEM(__pyx_args, 1);
+      __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+      break;
+      default: goto __pyx_L5_argtuple_error;
+    }
+  }
+  goto __pyx_L4_argument_unpacking_done;
+  __pyx_L5_argtuple_error:;
+  __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+        __Pyx_RaiseArgtupleInvalid("cvCvtColor", 1, 2, 2, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      }
+    }
+    if (unlikely(kw_args > 0)) {
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCvtColor") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+    }
+    __pyx_v_src = ((PyArrayObject *)values[0]);
+    __pyx_v_code = __Pyx_PyInt_AsInt(values[1]); if (unlikely((__pyx_v_code == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  } else if (PyTuple_GET_SIZE(__pyx_args) != 2) {
+    goto __pyx_L5_argtuple_error;
+  } else {
+    __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+    __pyx_v_code = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 1)); if (unlikely((__pyx_v_code == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  }
+  goto __pyx_L4_argument_unpacking_done;
+  __pyx_L5_argtuple_error:;
+  __Pyx_RaiseArgtupleInvalid("cvCvtColor", 1, 2, 2, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCvtColor");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_v_out = Py_None; __Pyx_INCREF(Py_None);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1109
+ *     """
+ * 
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+ * 
+ *     assert_nchannels(src, [1, 3])
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1111
+ *     validate_array(src)
+ * 
+ *     assert_nchannels(src, [1, 3])             # <<<<<<<<<<<<<<
+ *     assert_dtype(src, [UINT8])
+ * 
+ */
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1111; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1111; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1112
+=======
+  __pyx_v_conversion_params = Py_None; __Pyx_INCREF(Py_None);
+  __pyx_v_src_dtypes = Py_None; __Pyx_INCREF(Py_None);
+  __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1124
+ * def cvCvtColor(np.ndarray src, int code):
+ * 
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+ *     assert_dtype(src, [UINT8, UINT16, FLOAT32])
+ * 
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1124; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1125
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     validate_array(src)
+ *     assert_dtype(src, [UINT8, UINT16, FLOAT32])             # <<<<<<<<<<<<<<
+ * 
+ *     try:
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
+  __Pyx_GIVEREF(__pyx_1);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1115
+ * 
+ *     cdef np.npy_intp outshape[2]
+ *     outshape[0] = <np.npy_intp> pattern_size[0] * pattern_size[1]             # <<<<<<<<<<<<<<
+ *     outshape[1] = <np.npy_intp> 2
+=======
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1125; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1127
+ *     assert_dtype(src, [UINT8, UINT16, FLOAT32])
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     try:             # <<<<<<<<<<<<<<
+ *         conversion_params = _cvtcolor_dict[code]
+ *     except KeyError:
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_3 = __Pyx_PyInt_from_py_npy_intp(__pyx_1); if (unlikely((__pyx_t_3 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_2 = __Pyx_PyInt_to_py_npy_intp(((npy_intp)__pyx_t_3)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_4 = PyNumber_Multiply(__pyx_t_2, __pyx_1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_3 = __Pyx_PyInt_from_py_npy_intp(__pyx_t_4); if (unlikely((__pyx_t_3 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+  (__pyx_v_outshape[0]) = __pyx_t_3;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1116
+ *     cdef np.npy_intp outshape[2]
+ *     outshape[0] = <np.npy_intp> pattern_size[0] * pattern_size[1]
+ *     outshape[1] = <np.npy_intp> 2             # <<<<<<<<<<<<<<
+=======
+  {
+    PyObject *__pyx_save_exc_type, *__pyx_save_exc_value, *__pyx_save_exc_tb;
+    __Pyx_ExceptionSave(&__pyx_save_exc_type, &__pyx_save_exc_value, &__pyx_save_exc_tb);
+    __Pyx_XGOTREF(__pyx_save_exc_type);
+    __Pyx_XGOTREF(__pyx_save_exc_value);
+    __Pyx_XGOTREF(__pyx_save_exc_tb);
+    /*try:*/ {
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1128
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     try:
+ *         conversion_params = _cvtcolor_dict[code]             # <<<<<<<<<<<<<<
+ *     except KeyError:
+ *         print 'unknown conversion code'
+ */
+      __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp__cvtcolor_dict); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; __pyx_clineno = __LINE__; goto __pyx_L6_error;}
+      __Pyx_GOTREF(__pyx_1);
+      __pyx_2 = __Pyx_GetItemInt(__pyx_1, __pyx_v_code, sizeof(int), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1128; __pyx_clineno = __LINE__; goto __pyx_L6_error;}
+      __Pyx_GOTREF(__pyx_2);
+      __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+      __Pyx_DECREF(__pyx_v_conversion_params);
+      __pyx_v_conversion_params = __pyx_2;
+      __pyx_2 = 0;
+    }
+    __Pyx_XDECREF(__pyx_save_exc_type); __pyx_save_exc_type = 0;
+    __Pyx_XDECREF(__pyx_save_exc_value); __pyx_save_exc_value = 0;
+    __Pyx_XDECREF(__pyx_save_exc_tb); __pyx_save_exc_tb = 0;
+    goto __pyx_L13_try_end;
+    __pyx_L6_error:;
+    __Pyx_XDECREF(__pyx_3); __pyx_3 = 0;
+    __Pyx_XDECREF(__pyx_1); __pyx_1 = 0;
+    __Pyx_XDECREF(__pyx_2); __pyx_2 = 0;
+    __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0;
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1129
+ *     try:
+ *         conversion_params = _cvtcolor_dict[code]
+ *     except KeyError:             # <<<<<<<<<<<<<<
+ *         print 'unknown conversion code'
+ *         raise
+ */
+    __pyx_4 = PyErr_ExceptionMatches(__pyx_builtin_KeyError);
+    if (__pyx_4) {
+      __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCvtColor");
+      if (__Pyx_GetException(&__pyx_t_2, &__pyx_t_3, &__pyx_t_4) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;}
+      __Pyx_GOTREF(__pyx_t_2);
+      __Pyx_GOTREF(__pyx_t_3);
+      __Pyx_GOTREF(__pyx_t_4);
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1118
+ *     outshape[1] = <np.npy_intp> 2
+ * 
+ *     out = new_array(2, outshape, FLOAT32)             # <<<<<<<<<<<<<<
+ *     cdef CvPoint2D32f* cvpoints = array_as_cvPoint2D32f_ptr(out)
+ * 
+ */
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_4 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_outshape, __pyx_1)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __Pyx_DECREF(__pyx_v_out);
+  __pyx_v_out = __pyx_t_4;
+  __pyx_t_4 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1119
+=======
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1130
+ *         conversion_params = _cvtcolor_dict[code]
+ *     except KeyError:
+ *         print 'unknown conversion code'             # <<<<<<<<<<<<<<
+ *         raise
+ * 
+ */
+      if (__Pyx_PrintOne(__pyx_kp_166) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1130; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;}
+
+      /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1131
+ *     except KeyError:
+ *         print 'unknown conversion code'
+ *         raise             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     cdef int src_channels = <int>conversion_params[0]
+ */
+      __Pyx_Raise(__pyx_t_2, __pyx_t_3, __pyx_t_4);
+      {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1131; __pyx_clineno = __LINE__; goto __pyx_L8_except_error;}
+      __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+      __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+      __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+      goto __pyx_L7_exception_handled;
+    }
+    __pyx_L8_except_error:;
+    __Pyx_XDECREF(__pyx_save_exc_type);
+    __Pyx_XDECREF(__pyx_save_exc_value);
+    __Pyx_XDECREF(__pyx_save_exc_tb);
+    goto __pyx_L1_error;
+    __pyx_L7_exception_handled:;
+    __Pyx_XGIVEREF(__pyx_save_exc_type);
+    __Pyx_XGIVEREF(__pyx_save_exc_value);
+    __Pyx_XGIVEREF(__pyx_save_exc_tb);
+    __Pyx_ExceptionReset(__pyx_save_exc_type, __pyx_save_exc_value, __pyx_save_exc_tb);
+    __pyx_L13_try_end:;
+  }
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1133
+ *         raise
+ * 
+ *     cdef int src_channels = <int>conversion_params[0]             # <<<<<<<<<<<<<<
+ *     cdef int out_channels = <int>conversion_params[1]
+ *     src_dtypes = conversion_params[2]
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_v_cvpoints = __pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr(((PyArrayObject *)__pyx_v_out));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1122
+=======
+  __pyx_3 = __Pyx_GetItemInt(__pyx_v_conversion_params, 0, sizeof(long), PyInt_FromLong); if (!__pyx_3) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_3); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1133; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_v_src_channels = ((int)__pyx_t_1);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1134
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     cdef int src_channels = <int>conversion_params[0]
+ *     cdef int out_channels = <int>conversion_params[1]             # <<<<<<<<<<<<<<
+ *     src_dtypes = conversion_params[2]
+ * 
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_conversion_params, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_out_channels = ((int)__pyx_t_1);
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1123
+ *     cdef CvSize cvpattern_size
+ *     cvpattern_size.height = pattern_size[0]
+ *     cvpattern_size.width = pattern_size[1]             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1135
+ *     cdef int src_channels = <int>conversion_params[0]
+ *     cdef int out_channels = <int>conversion_params[1]
+ *     src_dtypes = conversion_params[2]             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     assert_nchannels(src, src_channels)
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_cvpattern_size.width = __pyx_t_1;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1126
+=======
+  __pyx_2 = __Pyx_GetItemInt(__pyx_v_conversion_params, 2, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __Pyx_DECREF(__pyx_v_src_dtypes);
+  __pyx_v_src_dtypes = __pyx_2;
+  __pyx_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1137
+ *     src_dtypes = conversion_params[2]
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     assert_nchannels(src, src_channels)             # <<<<<<<<<<<<<<
+ *     assert_dtype(src, src_dtypes)
+ * 
+ */
+  __pyx_t_4 = PyInt_FromLong(__pyx_v_src_channels); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_4);
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, __pyx_t_4); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1130
+ *     cdef int ncorners_found
+ *     c_cvFindChessboardCorners(&srcimg, cvpattern_size, cvpoints,
+ *                               &ncorners_found, flags)             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1138
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     assert_nchannels(src, src_channels)
+ *     assert_dtype(src, src_dtypes)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef np.ndarray out
+ */
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, __pyx_v_src_dtypes); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1138; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1132
+ *                               &ncorners_found, flags)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1146
+ *     cdef np.npy_intp out_shape2[2]
+ *     cdef np.npy_intp out_shape3[3]
+ *     out_shape2[0] = src.shape[0]             # <<<<<<<<<<<<<<
+ *     out_shape2[1] = src.shape[1]
+ *     out_shape3[0] = src.shape[0]
+ */
+  (__pyx_v_out_shape2[0]) = (__pyx_v_src->dimensions[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1147
+ *     cdef np.npy_intp out_shape3[3]
+ *     out_shape2[0] = src.shape[0]
+ *     out_shape2[1] = src.shape[1]             # <<<<<<<<<<<<<<
+ *     out_shape3[0] = src.shape[0]
+ *     out_shape3[1] = src.shape[1]
+ */
+  (__pyx_v_out_shape2[1]) = (__pyx_v_src->dimensions[1]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1148
+ *     out_shape2[0] = src.shape[0]
+ *     out_shape2[1] = src.shape[1]
+ *     out_shape3[0] = src.shape[0]             # <<<<<<<<<<<<<<
+ *     out_shape3[1] = src.shape[1]
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ */
+  (__pyx_v_out_shape3[0]) = (__pyx_v_src->dimensions[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1149
+ *     out_shape2[1] = src.shape[1]
+ *     out_shape3[0] = src.shape[0]
+ *     out_shape3[1] = src.shape[1]             # <<<<<<<<<<<<<<
+ * 
+ *     if out_channels == 1:
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __Pyx_XDECREF(__pyx_r);
+  __pyx_1 = PySequence_GetSlice(__pyx_v_out, 0, __pyx_v_ncorners_found); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_r = __pyx_1;
+  __pyx_1 = 0;
+=======
+  (__pyx_v_out_shape3[1]) = (__pyx_v_src->dimensions[1]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1151
+ *     out_shape3[1] = src.shape[1]
+ * 
+ *     if out_channels == 1:             # <<<<<<<<<<<<<<
+ *         out = new_array(2, out_shape2, src.dtype)
+ *     else:
+ */
+  __pyx_t_5 = (__pyx_v_out_channels == 1);
+  if (__pyx_t_5) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1152
+ * 
+ *     if out_channels == 1:
+ *         out = new_array(2, out_shape2, src.dtype)             # <<<<<<<<<<<<<<
+ *     else:
+ *         out_shape3[2] = <np.npy_intp>out_channels
+ */
+    __pyx_t_4 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_4);
+    __pyx_t_3 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_out_shape2, __pyx_t_4)); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1152; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
+    __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
+    __Pyx_DECREF(((PyObject *)__pyx_v_out));
+    __pyx_v_out = ((PyArrayObject *)__pyx_t_3);
+    __pyx_t_3 = 0;
+    goto __pyx_L16;
+  }
+  /*else*/ {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1154
+ *         out = new_array(2, out_shape2, src.dtype)
+ *     else:
+ *         out_shape3[2] = <np.npy_intp>out_channels             # <<<<<<<<<<<<<<
+ *         out = new_array(3, out_shape3, src.dtype)
+ * 
+ */
+    (__pyx_v_out_shape3[2]) = ((npy_intp)__pyx_v_out_channels);
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1155
+ *     else:
+ *         out_shape3[2] = <np.npy_intp>out_channels
+ *         out = new_array(3, out_shape3, src.dtype)             # <<<<<<<<<<<<<<
+ * 
+ *     cdef IplImage srcimg
+ */
+    __pyx_t_3 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_dtype); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_3);
+    __pyx_t_4 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(3, __pyx_v_out_shape3, __pyx_t_3)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1155; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_4);
+    __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+    __Pyx_DECREF(((PyObject *)__pyx_v_out));
+    __pyx_v_out = ((PyArrayObject *)__pyx_t_4);
+    __pyx_t_4 = 0;
+  }
+  __pyx_L16:;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1159
+ *     cdef IplImage srcimg
+ *     cdef IplImage outimg
+ *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(out, &outimg)
+ * 
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1160
+ *     cdef IplImage outimg
+ *     populate_iplimage(src, &srcimg)
+ *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
+ * 
+ *     c_cvCvtColor(&srcimg, &outimg, code)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1162
+ *     populate_iplimage(out, &outimg)
+ * 
+ *     c_cvCvtColor(&srcimg, &outimg, code)             # <<<<<<<<<<<<<<
+ * 
+ *     return out
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCvtColor((&__pyx_v_srcimg), (&__pyx_v_outimg), __pyx_v_code);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1164
+ *     c_cvCvtColor(&srcimg, &outimg, code)
+ * 
+ *     return out             # <<<<<<<<<<<<<<
+ * 
+ * def cvCalibrateCamera2(np.ndarray object_points, np.ndarray image_points,
+ */
+  __Pyx_XDECREF(__pyx_r);
+  __Pyx_INCREF(((PyObject *)__pyx_v_out));
+  __pyx_r = ((PyObject *)__pyx_v_out);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  goto __pyx_L0;
+
+  __pyx_r = Py_None; __Pyx_INCREF(Py_None);
+  goto __pyx_L0;
+  __pyx_L1_error:;
+  __Pyx_XDECREF(__pyx_1);
+  __Pyx_XDECREF(__pyx_2);
+  __Pyx_XDECREF(__pyx_3);
+  __Pyx_XDECREF(__pyx_t_2);
+  __Pyx_XDECREF(__pyx_t_3);
+  __Pyx_XDECREF(__pyx_t_4);
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCvtColor");
+  __pyx_r = NULL;
+  __pyx_L0:;
+  __Pyx_DECREF(__pyx_v_conversion_params);
+  __Pyx_DECREF(__pyx_v_src_dtypes);
+  __Pyx_DECREF((PyObject *)__pyx_v_out);
+  __Pyx_XGIVEREF(__pyx_r);
+  __Pyx_FinishRefcountContext();
+  return __pyx_r;
+}
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1134
+ *     return out[:ncorners_found]
+=======
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1166
+ *     return out
+ * 
+ * def cvCalibrateCamera2(np.ndarray object_points, np.ndarray image_points,             # <<<<<<<<<<<<<<
+ *            np.ndarray point_counts, image_size):
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ */
+
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/
+static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) {
+  PyArrayObject *__pyx_v_object_points = 0;
+  PyArrayObject *__pyx_v_image_points = 0;
+  PyArrayObject *__pyx_v_point_counts = 0;
+  PyObject *__pyx_v_image_size = 0;
+  npy_intp __pyx_v_intrinsics_shape[2];
+  PyArrayObject *__pyx_v_intrinsics = 0;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_ipl_intrinsics;
+  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmat_intrinsics;
+  npy_intp __pyx_v_distortion_shape[2];
+  PyArrayObject *__pyx_v_distortion = 0;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_ipl_distortion;
+  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmat_distortion;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_ipl_object_points;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_ipl_image_points;
+  __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage __pyx_v_ipl_point_counts;
+  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmat_object_points;
+  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmat_image_points;
+  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *__pyx_v_cvmat_point_counts;
+  struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvSize __pyx_v_cv_image_size;
+  PyObject *__pyx_r = NULL;
+  PyObject *__pyx_1 = 0;
+  int __pyx_t_1;
+  PyObject *__pyx_t_2 = NULL;
+  static PyObject **__pyx_pyargnames[] = {&__pyx_kp_object_points,&__pyx_kp_image_points,&__pyx_kp_point_counts,&__pyx_kp_image_size,0};
+  __Pyx_SetupRefcountContext("cvCalibrateCamera2");
+  __pyx_self = __pyx_self;
+  if (unlikely(__pyx_kwds)) {
+    Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
+    PyObject* values[4] = {0,0,0,0};
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+    values[3] = __pyx_k_64;
+=======
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
+      case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
+      case  2: values[1] = PyTuple_GET_ITEM(__pyx_args, 1);
+      case  1: values[0] = PyTuple_GET_ITEM(__pyx_args, 0);
+      case  0: break;
+      default: goto __pyx_L5_argtuple_error;
+    }
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  0:
+      values[0] = PyDict_GetItem(__pyx_kwds, __pyx_kp_object_points);
+      if (likely(values[0])) kw_args--;
+      else goto __pyx_L5_argtuple_error;
+      case  1:
+      values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_image_points);
+      if (likely(values[1])) kw_args--;
+      else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+        __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+        __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1166; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+      }
+      case  2:
+      values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_point_counts);
+      if (likely(values[2])) kw_args--;
+      else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+        __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+        __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1166; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+      }
+      case  3:
+      values[3] = PyDict_GetItem(__pyx_kwds, __pyx_kp_image_size);
+      if (likely(values[3])) kw_args--;
+      else {
+        __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, 3); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1166; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      }
+    }
+    if (unlikely(kw_args > 0)) {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvDrawChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvCalibrateCamera2") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1166; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+    }
+    __pyx_v_object_points = ((PyArrayObject *)values[0]);
+    __pyx_v_image_points = ((PyArrayObject *)values[1]);
+    __pyx_v_point_counts = ((PyArrayObject *)values[2]);
+    __pyx_v_image_size = values[3];
+  } else if (PyTuple_GET_SIZE(__pyx_args) != 4) {
+    goto __pyx_L5_argtuple_error;
+  } else {
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+    __pyx_v_in_place = __pyx_k_64;
+    switch (PyTuple_GET_SIZE(__pyx_args)) {
+      case  4:
+      __pyx_v_in_place = PyTuple_GET_ITEM(__pyx_args, 3);
+      case  3:
+      __pyx_v_corners = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 2));
+      __pyx_v_pattern_size = PyTuple_GET_ITEM(__pyx_args, 1);
+      __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+      break;
+      default: goto __pyx_L5_argtuple_error;
+    }
+  }
+  goto __pyx_L4_argument_unpacking_done;
+  __pyx_L5_argtuple_error:;
+  __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+=======
+    __pyx_v_object_points = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
+    __pyx_v_image_points = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 1));
+    __pyx_v_point_counts = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 2));
+    __pyx_v_image_size = PyTuple_GET_ITEM(__pyx_args, 3);
+  }
+  goto __pyx_L4_argument_unpacking_done;
+  __pyx_L5_argtuple_error:;
+  __Pyx_RaiseArgtupleInvalid("cvCalibrateCamera2", 1, 4, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1166; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  __pyx_L3_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvCalibrateCamera2");
+  return NULL;
+  __pyx_L4_argument_unpacking_done:;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_corners), __pyx_ptype_5numpy_ndarray, 1, "corners", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1151
+ *               image. If false, a copy of the image will be made and drawn to.
+ *     """
+ *     validate_array(src)             # <<<<<<<<<<<<<<
+=======
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_object_points), __pyx_ptype_5numpy_ndarray, 1, "object_points", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1166; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_image_points), __pyx_ptype_5numpy_ndarray, 1, "image_points", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1166; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_point_counts), __pyx_ptype_5numpy_ndarray, 1, "point_counts", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1170
+ * 
+ *     # Validate input
+ *     validate_array(object_points)             # <<<<<<<<<<<<<<
+ *     assert_ndims(object_points, [2])
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1151; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1153
+ *     validate_array(src)
+ * 
+ *     assert_nchannels(src, [3])             # <<<<<<<<<<<<<<
+ *     assert_dtype(src, [UINT8])
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_object_points); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1170; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1171
+ *     # Validate input
+ *     validate_array(object_points)
+ *     assert_ndims(object_points, [2])             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     validate_array(image_points)
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1154
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_object_points, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1171; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1173
+ *     assert_ndims(object_points, [2])
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     validate_array(image_points)             # <<<<<<<<<<<<<<
+ *     assert_ndims(image_points, [2])
+ * 
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
+  __Pyx_GIVEREF(__pyx_1);
+  __pyx_1 = 0;
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1156
+ *     assert_dtype(src, [UINT8])
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_image_points); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1174
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     validate_array(image_points)
+ *     assert_ndims(image_points, [2])             # <<<<<<<<<<<<<<
+ * 
+ *     assert_dtype(point_counts, [INT32])
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1156; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1156; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1157
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_image_points, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1174; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1176
+ *     assert_ndims(image_points, [2])
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     assert_dtype(point_counts, [INT32])             # <<<<<<<<<<<<<<
+ *     assert_ndims(point_counts, [1])
+ * 
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_165); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
+  __Pyx_GIVEREF(__pyx_1);
+  __pyx_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1161
+ *     cdef np.ndarray out
+=======
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_point_counts, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1176; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1177
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     assert_dtype(point_counts, [INT32])
+ *     assert_ndims(point_counts, [1])             # <<<<<<<<<<<<<<
+ * 
+ *     # Allocate a new intrinsics array
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = (!__pyx_t_3);
+  if (__pyx_t_4) {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1162
+ * 
+ *     if not in_place:
+ *         out = src.copy()             # <<<<<<<<<<<<<<
+ *     else:
+ *         out = src
+ */
+    __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_copy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1162; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_2);
+    __pyx_t_5 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1162; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_GOTREF(__pyx_t_5);
+    __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+    if (!(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1162; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __Pyx_DECREF(((PyObject *)__pyx_v_out));
+    __pyx_v_out = ((PyArrayObject *)__pyx_t_5);
+    __pyx_t_5 = 0;
+    goto __pyx_L6;
+  }
+  /*else*/ {
+
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1164
+ *         out = src.copy()
+ *     else:
+ *         out = src             # <<<<<<<<<<<<<<
+ * 
+ *     cdef CvSize cvpattern_size
+=======
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_point_counts, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1177; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1181
+ *     # Allocate a new intrinsics array
+ *     cdef np.npy_intp intrinsics_shape[2]
+ *     intrinsics_shape[0] = <np.npy_intp> 3             # <<<<<<<<<<<<<<
+ *     intrinsics_shape[1] = <np.npy_intp> 3
+ *     cdef np.ndarray intrinsics = new_array(2, intrinsics_shape, FLOAT64)
+ */
+  (__pyx_v_intrinsics_shape[0]) = ((npy_intp)3);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1182
+ *     cdef np.npy_intp intrinsics_shape[2]
+ *     intrinsics_shape[0] = <np.npy_intp> 3
+ *     intrinsics_shape[1] = <np.npy_intp> 3             # <<<<<<<<<<<<<<
+ *     cdef np.ndarray intrinsics = new_array(2, intrinsics_shape, FLOAT64)
+ *     cdef IplImage ipl_intrinsics
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ */
+  (__pyx_v_intrinsics_shape[1]) = ((npy_intp)3);
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1167
+ * 
+ *     cdef CvSize cvpattern_size
+ *     cvpattern_size.height = pattern_size[0]             # <<<<<<<<<<<<<<
+ *     cvpattern_size.width = pattern_size[1]
+ * 
+ */
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1183
+ *     intrinsics_shape[0] = <np.npy_intp> 3
+ *     intrinsics_shape[1] = <np.npy_intp> 3
+ *     cdef np.ndarray intrinsics = new_array(2, intrinsics_shape, FLOAT64)             # <<<<<<<<<<<<<<
+ *     cdef IplImage ipl_intrinsics
+ *     populate_iplimage(intrinsics, &ipl_intrinsics)
+ */
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_164); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_intrinsics_shape, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1183; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_intrinsics = ((PyArrayObject *)__pyx_t_2);
+  __pyx_t_2 = 0;
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1168
+ *     cdef CvSize cvpattern_size
+ *     cvpattern_size.height = pattern_size[0]
+ *     cvpattern_size.width = pattern_size[1]             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1185
+ *     cdef np.ndarray intrinsics = new_array(2, intrinsics_shape, FLOAT64)
+ *     cdef IplImage ipl_intrinsics
+ *     populate_iplimage(intrinsics, &ipl_intrinsics)             # <<<<<<<<<<<<<<
+ *     cdef CvMat* cvmat_intrinsics = cvmat_ptr_from_iplimage(&ipl_intrinsics)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1168; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1168; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_intrinsics, (&__pyx_v_ipl_intrinsics));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1186
+ *     cdef IplImage ipl_intrinsics
+ *     populate_iplimage(intrinsics, &ipl_intrinsics)
+ *     cdef CvMat* cvmat_intrinsics = cvmat_ptr_from_iplimage(&ipl_intrinsics)             # <<<<<<<<<<<<<<
+ * 
+ *     # Allocate a new distortion array
+ */
+  __pyx_v_cvmat_intrinsics = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_intrinsics));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1190
+ *     # Allocate a new distortion array
+ *     cdef np.npy_intp distortion_shape[2]
+ *     distortion_shape[0] = <np.npy_intp> 1             # <<<<<<<<<<<<<<
+ *     distortion_shape[1] = <np.npy_intp> 4
+ *     cdef np.ndarray distortion = new_array(2, distortion_shape, FLOAT64)
+ */
+  (__pyx_v_distortion_shape[0]) = ((npy_intp)1);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1191
+ *     cdef np.npy_intp distortion_shape[2]
+ *     distortion_shape[0] = <np.npy_intp> 1
+ *     distortion_shape[1] = <np.npy_intp> 4             # <<<<<<<<<<<<<<
+ *     cdef np.ndarray distortion = new_array(2, distortion_shape, FLOAT64)
+ *     cdef IplImage ipl_distortion
+ */
+  (__pyx_v_distortion_shape[1]) = ((npy_intp)4);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1192
+ *     distortion_shape[0] = <np.npy_intp> 1
+ *     distortion_shape[1] = <np.npy_intp> 4
+ *     cdef np.ndarray distortion = new_array(2, distortion_shape, FLOAT64)             # <<<<<<<<<<<<<<
+ *     cdef IplImage ipl_distortion
+ *     populate_iplimage(distortion, &ipl_distortion)
+ */
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_164); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1192; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_distortion_shape, __pyx_1)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1192; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_distortion = ((PyArrayObject *)__pyx_t_2);
+  __pyx_t_2 = 0;
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1171
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1194
+ *     cdef np.ndarray distortion = new_array(2, distortion_shape, FLOAT64)
+ *     cdef IplImage ipl_distortion
+ *     populate_iplimage(distortion, &ipl_distortion)             # <<<<<<<<<<<<<<
+ *     cdef CvMat* cvmat_distortion = cvmat_ptr_from_iplimage(&ipl_distortion)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_distortion, (&__pyx_v_ipl_distortion));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1195
+ *     cdef IplImage ipl_distortion
+ *     populate_iplimage(distortion, &ipl_distortion)
+ *     cdef CvMat* cvmat_distortion = cvmat_ptr_from_iplimage(&ipl_distortion)             # <<<<<<<<<<<<<<
+ * 
+ *     # Make the object & image points & npoints accessible for OpenCV
+ */
+  __pyx_v_cvmat_distortion = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_distortion));
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1173
+ *     populate_iplimage(out, &outimg)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1200
+ *     cdef IplImage ipl_object_points, ipl_image_points, ipl_point_counts
+ *     cdef CvMat* cvmat_object_points, *cvmat_image_points, *cvmat_point_counts
+ *     populate_iplimage(object_points, &ipl_object_points)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(image_points, &ipl_image_points)
+ *     populate_iplimage(point_counts, &ipl_point_counts)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_object_points, (&__pyx_v_ipl_object_points));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1201
+ *     cdef CvMat* cvmat_object_points, *cvmat_image_points, *cvmat_point_counts
+ *     populate_iplimage(object_points, &ipl_object_points)
+ *     populate_iplimage(image_points, &ipl_image_points)             # <<<<<<<<<<<<<<
+ *     populate_iplimage(point_counts, &ipl_point_counts)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_image_points, (&__pyx_v_ipl_image_points));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1202
+ *     populate_iplimage(object_points, &ipl_object_points)
+ *     populate_iplimage(image_points, &ipl_image_points)
+ *     populate_iplimage(point_counts, &ipl_point_counts)             # <<<<<<<<<<<<<<
+ * 
+ *     cvmat_object_points = cvmat_ptr_from_iplimage(&ipl_object_points)
+ */
+  __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_point_counts, (&__pyx_v_ipl_point_counts));
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1175
+ *     cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1204
+ *     populate_iplimage(point_counts, &ipl_point_counts)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     cvmat_object_points = cvmat_ptr_from_iplimage(&ipl_object_points)             # <<<<<<<<<<<<<<
+ *     cvmat_image_points = cvmat_ptr_from_iplimage(&ipl_image_points)
+ *     cvmat_point_counts = cvmat_ptr_from_iplimage(&ipl_point_counts)
+ */
+  __pyx_v_cvmat_object_points = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_object_points));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1205
+ * 
+ *     cvmat_object_points = cvmat_ptr_from_iplimage(&ipl_object_points)
+ *     cvmat_image_points = cvmat_ptr_from_iplimage(&ipl_image_points)             # <<<<<<<<<<<<<<
+ *     cvmat_point_counts = cvmat_ptr_from_iplimage(&ipl_point_counts)
+ * 
+ */
+  __pyx_v_cvmat_image_points = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_image_points));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1206
+ *     cvmat_object_points = cvmat_ptr_from_iplimage(&ipl_object_points)
+ *     cvmat_image_points = cvmat_ptr_from_iplimage(&ipl_image_points)
+ *     cvmat_point_counts = cvmat_ptr_from_iplimage(&ipl_point_counts)             # <<<<<<<<<<<<<<
+ * 
+ *     # Set image size
+ */
+  __pyx_v_cvmat_point_counts = __pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage((&__pyx_v_ipl_point_counts));
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1210
+ *     # Set image size
+ *     cdef CvSize cv_image_size
+ *     cv_image_size.height = image_size[0]             # <<<<<<<<<<<<<<
+ *     cv_image_size.width = image_size[1]
+ * 
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_2 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_5 = PyNumber_Multiply(__pyx_1, __pyx_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_5);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_t_5); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
+  __pyx_v_ncount = __pyx_t_1;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1179
+ *     cdef int pattern_was_found
+=======
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_image_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1210; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1210; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_cv_image_size.height = __pyx_t_1;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1211
+ *     cdef CvSize cv_image_size
+ *     cv_image_size.height = image_size[0]
+ *     cv_image_size.width = image_size[1]             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     # Call the function
+ */
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_image_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1211; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1211; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_v_cv_image_size.width = __pyx_t_1;
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1180
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1216
+ *     c_cvCalibrateCamera2(cvmat_object_points, cvmat_image_points,
+ *                          cvmat_point_counts, cv_image_size, cvmat_intrinsics,
+ *                          cvmat_distortion, NULL, NULL, 0)             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     # Convert distortion back into a vector
+ */
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCalibrateCamera2(__pyx_v_cvmat_object_points, __pyx_v_cvmat_image_points, __pyx_v_cvmat_point_counts, __pyx_v_cv_image_size, __pyx_v_cvmat_intrinsics, __pyx_v_cvmat_distortion, NULL, NULL, 0);
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1182
+ *         pattern_was_found = 1
+ *     else:
+ *         pattern_was_found = 0             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1219
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     # Convert distortion back into a vector
+ *     distortion = np.PyArray_Squeeze(distortion)             # <<<<<<<<<<<<<<
+ * 
+ *     PyMem_Free(cvmat_intrinsics)
+ */
+  __pyx_t_2 = PyArray_Squeeze(__pyx_v_distortion); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  if (!(__Pyx_TypeTest(__pyx_t_2, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_v_distortion));
+  __pyx_v_distortion = ((PyArrayObject *)__pyx_t_2);
+  __pyx_t_2 = 0;
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1185
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1221
+ *     distortion = np.PyArray_Squeeze(distortion)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ *     PyMem_Free(cvmat_intrinsics)             # <<<<<<<<<<<<<<
+ *     PyMem_Free(cvmat_distortion)
+ *     PyMem_Free(cvmat_object_points)
+ */
+  PyMem_Free(__pyx_v_cvmat_intrinsics);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1222
+ * 
+ *     PyMem_Free(cvmat_intrinsics)
+ *     PyMem_Free(cvmat_distortion)             # <<<<<<<<<<<<<<
+ *     PyMem_Free(cvmat_object_points)
+ *     PyMem_Free(cvmat_image_points)
+ */
+  PyMem_Free(__pyx_v_cvmat_distortion);
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1187
+ *         ncount, pattern_was_found)
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1223
+ *     PyMem_Free(cvmat_intrinsics)
+ *     PyMem_Free(cvmat_distortion)
+ *     PyMem_Free(cvmat_object_points)             # <<<<<<<<<<<<<<
+ *     PyMem_Free(cvmat_image_points)
+ *     PyMem_Free(cvmat_point_counts)
+ */
+  PyMem_Free(__pyx_v_cvmat_object_points);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1224
+ *     PyMem_Free(cvmat_distortion)
+ *     PyMem_Free(cvmat_object_points)
+ *     PyMem_Free(cvmat_image_points)             # <<<<<<<<<<<<<<
+ *     PyMem_Free(cvmat_point_counts)
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  */
   PyMem_Free(__pyx_v_cvmat_image_points);
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1091
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1225
  *     PyMem_Free(cvmat_object_points)
  *     PyMem_Free(cvmat_image_points)
  *     PyMem_Free(cvmat_point_counts)             # <<<<<<<<<<<<<<
@@ -9162,7 +15914,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
  */
   PyMem_Free(__pyx_v_cvmat_point_counts);
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1093
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1227
  *     PyMem_Free(cvmat_point_counts)
  * 
  *     return intrinsics, distortion             # <<<<<<<<<<<<<<
@@ -9170,7 +15922,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
  * def cvFindChessboardCorners(np.ndarray src, pattern_size,
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1093; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1227; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(((PyObject *)__pyx_v_intrinsics));
   PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_v_intrinsics));
@@ -9197,7 +15949,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2(
   return __pyx_r;
 }
 
-/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1095
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1229
  *     return intrinsics, distortion
  * 
  * def cvFindChessboardCorners(np.ndarray src, pattern_size,             # <<<<<<<<<<<<<<
@@ -9245,7 +15997,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor
       values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_pattern_size);
       if (likely(values[1])) kw_args--;
       else {
-        __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+        __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1229; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       }
       case  2:
       if (kw_args > 0) {
@@ -9254,20 +16006,20 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor
       }
     }
     if (unlikely(kw_args > 0)) {
-      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFindChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvFindChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1229; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     __pyx_v_pattern_size = values[1];
     if (values[2]) {
-      __pyx_v_flags = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      __pyx_v_flags = __Pyx_PyInt_AsInt(values[2]); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     } else {
-      __pyx_v_flags = __pyx_k_63;
+      __pyx_v_flags = __pyx_k_138;
     }
   } else {
-    __pyx_v_flags = __pyx_k_63;
+    __pyx_v_flags = __pyx_k_138;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  3:
-      __pyx_v_flags = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      __pyx_v_flags = __Pyx_PyInt_AsInt(PyTuple_GET_ITEM(__pyx_args, 2)); if (unlikely((__pyx_v_flags == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       case  2:
       __pyx_v_pattern_size = PyTuple_GET_ITEM(__pyx_args, 1);
       __pyx_v_src = ((PyArrayObject *)PyTuple_GET_ITEM(__pyx_args, 0));
@@ -9277,31 +16029,31 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __Pyx_RaiseArgtupleInvalid("cvFindChessboardCorners", 0, 2, 3, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1229; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvFindChessboardCorners");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_v_out = Py_None; __Pyx_INCREF(Py_None);
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1095; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1109
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1243
  *     """
  * 
  *     validate_array(src)             # <<<<<<<<<<<<<<
  * 
  *     assert_nchannels(src, [1, 3])
  */
-  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1109; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1243; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1111
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1245
  *     validate_array(src)
  * 
  *     assert_nchannels(src, [1, 3])             # <<<<<<<<<<<<<<
  *     assert_dtype(src, [UINT8])
  * 
  */
-  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1111; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_1);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
@@ -9309,50 +16061,50 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor
   __Pyx_INCREF(__pyx_int_3);
   PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
   __Pyx_GIVEREF(__pyx_int_3);
-  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1111; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1245; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1112
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1246
  * 
  *     assert_nchannels(src, [1, 3])
  *     assert_dtype(src, [UINT8])             # <<<<<<<<<<<<<<
  * 
  *     cdef np.npy_intp outshape[2]
  */
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
-  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
   __pyx_1 = 0;
-  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1246; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1115
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1249
  * 
  *     cdef np.npy_intp outshape[2]
  *     outshape[0] = <np.npy_intp> pattern_size[0] * pattern_size[1]             # <<<<<<<<<<<<<<
  *     outshape[1] = <np.npy_intp> 2
  * 
  */
-  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
-  __pyx_t_3 = __Pyx_PyInt_from_py_npy_intp(__pyx_1); if (unlikely((__pyx_t_3 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyInt_from_py_npy_intp(__pyx_1); if (unlikely((__pyx_t_3 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_t_2 = __Pyx_PyInt_to_py_npy_intp(((npy_intp)__pyx_t_3)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = __Pyx_PyInt_to_py_npy_intp(((npy_intp)__pyx_t_3)); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
-  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
-  __pyx_t_4 = PyNumber_Multiply(__pyx_t_2, __pyx_1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = PyNumber_Multiply(__pyx_t_2, __pyx_1); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
-  __pyx_t_3 = __Pyx_PyInt_from_py_npy_intp(__pyx_t_4); if (unlikely((__pyx_t_3 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1115; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyInt_from_py_npy_intp(__pyx_t_4); if (unlikely((__pyx_t_3 == (npy_intp)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1249; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0;
   (__pyx_v_outshape[0]) = __pyx_t_3;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1116
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1250
  *     cdef np.npy_intp outshape[2]
  *     outshape[0] = <np.npy_intp> pattern_size[0] * pattern_size[1]
  *     outshape[1] = <np.npy_intp> 2             # <<<<<<<<<<<<<<
@@ -9361,59 +16113,59 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor
  */
   (__pyx_v_outshape[1]) = ((npy_intp)2);
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1118
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1252
  *     outshape[1] = <np.npy_intp> 2
  * 
  *     out = new_array(2, outshape, FLOAT32)             # <<<<<<<<<<<<<<
  *     cdef CvPoint2D32f* cvpoints = array_as_cvPoint2D32f_ptr(out)
  * 
  */
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
-  __pyx_t_4 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_outshape, __pyx_1)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1118; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_4 = ((PyObject *)__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array(2, __pyx_v_outshape, __pyx_1)); if (unlikely(!__pyx_t_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1252; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_4);
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
   __Pyx_DECREF(__pyx_v_out);
   __pyx_v_out = __pyx_t_4;
   __pyx_t_4 = 0;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1119
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1253
  * 
  *     out = new_array(2, outshape, FLOAT32)
  *     cdef CvPoint2D32f* cvpoints = array_as_cvPoint2D32f_ptr(out)             # <<<<<<<<<<<<<<
  * 
  *     cdef CvSize cvpattern_size
  */
-  if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1119; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (!(__Pyx_TypeTest(__pyx_v_out, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1253; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_v_cvpoints = __pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr(((PyArrayObject *)__pyx_v_out));
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1122
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1256
  * 
  *     cdef CvSize cvpattern_size
  *     cvpattern_size.height = pattern_size[0]             # <<<<<<<<<<<<<<
  *     cvpattern_size.width = pattern_size[1]
  * 
  */
-  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
-  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1256; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_v_cvpattern_size.height = __pyx_t_1;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1123
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1257
  *     cdef CvSize cvpattern_size
  *     cvpattern_size.height = pattern_size[0]
  *     cvpattern_size.width = pattern_size[1]             # <<<<<<<<<<<<<<
  * 
  *     cdef IplImage srcimg
  */
-  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
-  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1123; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1257; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_v_cvpattern_size.width = __pyx_t_1;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1126
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1260
  * 
  *     cdef IplImage srcimg
  *     populate_iplimage(src, &srcimg)             # <<<<<<<<<<<<<<
@@ -9422,7 +16174,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_src, (&__pyx_v_srcimg));
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1130
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1264
  *     cdef int ncorners_found
  *     c_cvFindChessboardCorners(&srcimg, cvpattern_size, cvpoints,
  *                               &ncorners_found, flags)             # <<<<<<<<<<<<<<
@@ -9431,7 +16183,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor
  */
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners((&__pyx_v_srcimg), __pyx_v_cvpattern_size, __pyx_v_cvpoints, (&__pyx_v_ncorners_found), __pyx_v_flags);
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1132
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1266
  *                               &ncorners_found, flags)
  * 
  *     return out[:ncorners_found]             # <<<<<<<<<<<<<<
@@ -9439,7 +16191,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor
  * def cvDrawChessboardCorners(np.ndarray src, pattern_size, np.ndarray corners,
  */
   __Pyx_XDECREF(__pyx_r);
-  __pyx_1 = PySequence_GetSlice(__pyx_v_out, 0, __pyx_v_ncorners_found); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1132; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = PySequence_GetSlice(__pyx_v_out, 0, __pyx_v_ncorners_found); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1266; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_r = __pyx_1;
   __pyx_1 = 0;
@@ -9460,7 +16212,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCor
   return __pyx_r;
 }
 
-/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1134
+/* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1268
  *     return out[:ncorners_found]
  * 
  * def cvDrawChessboardCorners(np.ndarray src, pattern_size, np.ndarray corners,             # <<<<<<<<<<<<<<
@@ -9495,7 +16247,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
   if (unlikely(__pyx_kwds)) {
     Py_ssize_t kw_args = PyDict_Size(__pyx_kwds);
     PyObject* values[4] = {0,0,0,0};
-    values[3] = __pyx_k_64;
+    values[3] = __pyx_k_139;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  4: values[3] = PyTuple_GET_ITEM(__pyx_args, 3);
       case  3: values[2] = PyTuple_GET_ITEM(__pyx_args, 2);
@@ -9513,13 +16265,13 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
       values[1] = PyDict_GetItem(__pyx_kwds, __pyx_kp_pattern_size);
       if (likely(values[1])) kw_args--;
       else {
-        __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+        __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, 1); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       }
       case  2:
       values[2] = PyDict_GetItem(__pyx_kwds, __pyx_kp_corners);
       if (likely(values[2])) kw_args--;
       else {
-        __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+        __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, 2); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
       }
       case  3:
       if (kw_args > 0) {
@@ -9528,14 +16280,14 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
       }
     }
     if (unlikely(kw_args > 0)) {
-      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvDrawChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+      if (unlikely(__Pyx_ParseOptionalKeywords(__pyx_kwds, __pyx_pyargnames, 0, values, PyTuple_GET_SIZE(__pyx_args), "cvDrawChessboardCorners") < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
     }
     __pyx_v_src = ((PyArrayObject *)values[0]);
     __pyx_v_pattern_size = values[1];
     __pyx_v_corners = ((PyArrayObject *)values[2]);
     __pyx_v_in_place = values[3];
   } else {
-    __pyx_v_in_place = __pyx_k_64;
+    __pyx_v_in_place = __pyx_k_139;
     switch (PyTuple_GET_SIZE(__pyx_args)) {
       case  4:
       __pyx_v_in_place = PyTuple_GET_ITEM(__pyx_args, 3);
@@ -9549,112 +16301,112 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
   }
   goto __pyx_L4_argument_unpacking_done;
   __pyx_L5_argtuple_error:;
-  __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
+  __Pyx_RaiseArgtupleInvalid("cvDrawChessboardCorners", 0, 3, 4, PyTuple_GET_SIZE(__pyx_args)); {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; __pyx_clineno = __LINE__; goto __pyx_L3_error;}
   __pyx_L3_error:;
   __Pyx_AddTraceback("scikits.image.opencv.opencv_cv.cvDrawChessboardCorners");
   return NULL;
   __pyx_L4_argument_unpacking_done:;
   __pyx_v_out = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None);
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_corners), __pyx_ptype_5numpy_ndarray, 1, "corners", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_src), __pyx_ptype_5numpy_ndarray, 1, "src", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_corners), __pyx_ptype_5numpy_ndarray, 1, "corners", 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1268; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1151
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1285
  *               image. If false, a copy of the image will be made and drawn to.
  *     """
  *     validate_array(src)             # <<<<<<<<<<<<<<
  * 
  *     assert_nchannels(src, [3])
  */
-  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1151; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array(__pyx_v_src); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1285; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1153
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1287
  *     validate_array(src)
  * 
  *     assert_nchannels(src, [3])             # <<<<<<<<<<<<<<
  *     assert_dtype(src, [UINT8])
  * 
  */
-  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_3);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
   __Pyx_GIVEREF(__pyx_int_3);
-  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1287; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1154
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1288
  * 
  *     assert_nchannels(src, [3])
  *     assert_dtype(src, [UINT8])             # <<<<<<<<<<<<<<
  * 
  *     assert_ndims(corners, [2])
  */
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
-  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
   __pyx_1 = 0;
-  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1154; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_src, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1288; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1156
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1290
  *     assert_dtype(src, [UINT8])
  * 
  *     assert_ndims(corners, [2])             # <<<<<<<<<<<<<<
  *     assert_dtype(corners, [FLOAT32])
  * 
  */
-  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1156; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   __Pyx_INCREF(__pyx_int_2);
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_2);
   __Pyx_GIVEREF(__pyx_int_2);
-  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1156; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1290; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1157
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1291
  * 
  *     assert_ndims(corners, [2])
  *     assert_dtype(corners, [FLOAT32])             # <<<<<<<<<<<<<<
  * 
  *     cdef np.ndarray out
  */
-  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
-  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyList_SET_ITEM(__pyx_t_2, 0, __pyx_1);
   __Pyx_GIVEREF(__pyx_1);
   __pyx_1 = 0;
-  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1157; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype(__pyx_v_corners, ((PyObject *)__pyx_t_2)); if (unlikely(__pyx_t_1 == -1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1291; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1161
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1295
  *     cdef np.ndarray out
  * 
  *     if not in_place:             # <<<<<<<<<<<<<<
  *         out = src.copy()
  *     else:
  */
-  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_3 = __Pyx_PyObject_IsTrue(__pyx_v_in_place); if (unlikely(__pyx_t_3 < 0)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1295; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_t_4 = (!__pyx_t_3);
   if (__pyx_t_4) {
 
-    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1162
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1296
  * 
  *     if not in_place:
  *         out = src.copy()             # <<<<<<<<<<<<<<
  *     else:
  *         out = src
  */
-    __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_copy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1162; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_2 = PyObject_GetAttr(((PyObject *)__pyx_v_src), __pyx_kp_copy); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_2);
-    __pyx_t_5 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1162; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    __pyx_t_5 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_empty_tuple), NULL); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_GOTREF(__pyx_t_5);
     __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
-    if (!(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1162; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+    if (!(__Pyx_TypeTest(__pyx_t_5, __pyx_ptype_5numpy_ndarray))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1296; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(((PyObject *)__pyx_v_out));
     __pyx_v_out = ((PyArrayObject *)__pyx_t_5);
     __pyx_t_5 = 0;
@@ -9662,7 +16414,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
   }
   /*else*/ {
 
-    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1164
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1298
  *         out = src.copy()
  *     else:
  *         out = src             # <<<<<<<<<<<<<<
@@ -9675,33 +16427,33 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
   }
   __pyx_L6:;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1167
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1301
  * 
  *     cdef CvSize cvpattern_size
  *     cvpattern_size.height = pattern_size[0]             # <<<<<<<<<<<<<<
  *     cvpattern_size.width = pattern_size[1]
  * 
  */
-  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1301; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
-  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1301; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_v_cvpattern_size.height = __pyx_t_1;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1168
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1302
  *     cdef CvSize cvpattern_size
  *     cvpattern_size.height = pattern_size[0]
  *     cvpattern_size.width = pattern_size[1]             # <<<<<<<<<<<<<<
  * 
  *     cdef IplImage outimg
  */
-  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1168; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1302; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
-  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1168; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1302; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
   __pyx_v_cvpattern_size.width = __pyx_t_1;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1171
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1305
  * 
  *     cdef IplImage outimg
  *     populate_iplimage(out, &outimg)             # <<<<<<<<<<<<<<
@@ -9710,7 +16462,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
  */
   __pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage(__pyx_v_out, (&__pyx_v_outimg));
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1173
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1307
  *     populate_iplimage(out, &outimg)
  * 
  *     cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners)             # <<<<<<<<<<<<<<
@@ -9719,26 +16471,26 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
  */
   __pyx_v_cvcorners = __pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr(__pyx_v_corners);
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1175
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1309
  *     cdef CvPoint2D32f* cvcorners = array_as_cvPoint2D32f_ptr(corners)
  * 
  *     cdef int ncount = pattern_size[0] * pattern_size[1]             # <<<<<<<<<<<<<<
  * 
  *     cdef int pattern_was_found
  */
-  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_1 = __Pyx_GetItemInt(__pyx_v_pattern_size, 0, sizeof(long), PyInt_FromLong); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
-  __pyx_2 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_2 = __Pyx_GetItemInt(__pyx_v_pattern_size, 1, sizeof(long), PyInt_FromLong); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
-  __pyx_t_5 = PyNumber_Multiply(__pyx_1, __pyx_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_5 = PyNumber_Multiply(__pyx_1, __pyx_2); if (unlikely(!__pyx_t_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_5);
   __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
-  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_t_5); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1175; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_t_1 = __Pyx_PyInt_AsInt(__pyx_t_5); if (unlikely((__pyx_t_1 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1309; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
   __pyx_v_ncount = __pyx_t_1;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1179
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1313
  *     cdef int pattern_was_found
  * 
  *     if corners.shape[0] == ncount:             # <<<<<<<<<<<<<<
@@ -9748,7 +16500,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
   __pyx_t_4 = ((__pyx_v_corners->dimensions[0]) == __pyx_v_ncount);
   if (__pyx_t_4) {
 
-    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1180
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1314
  * 
  *     if corners.shape[0] == ncount:
  *         pattern_was_found = 1             # <<<<<<<<<<<<<<
@@ -9760,7 +16512,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
   }
   /*else*/ {
 
-    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1182
+    /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1316
  *         pattern_was_found = 1
  *     else:
  *         pattern_was_found = 0             # <<<<<<<<<<<<<<
@@ -9771,7 +16523,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
   }
   __pyx_L7:;
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1185
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1319
  * 
  *     c_cvDrawChessboardCorners(&outimg, cvpattern_size, cvcorners,
  *         ncount, pattern_was_found)             # <<<<<<<<<<<<<<
@@ -9780,7 +16532,7 @@ static PyObject *__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCor
  */
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners((&__pyx_v_outimg), __pyx_v_cvpattern_size, __pyx_v_cvcorners, __pyx_v_ncount, __pyx_v_pattern_was_found);
 
-  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1187
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1321
  *         ncount, pattern_was_found)
  * 
  *     return out             # <<<<<<<<<<<<<<
@@ -10732,6 +17484,35 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc
     __pyx_v_childname = __pyx_t_3;
     __pyx_t_3 = 0;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+static struct PyMethodDef __pyx_methods[] = {
+  {__Pyx_NAMESTR("cvSobel"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSobel, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvSobel)},
+  {__Pyx_NAMESTR("cvLaplace"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLaplace, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvLaplace)},
+  {__Pyx_NAMESTR("cvCanny"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCanny, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvCanny)},
+  {__Pyx_NAMESTR("cvPreCornerDetect"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvPreCornerDetect)},
+  {__Pyx_NAMESTR("cvCornerEigenValsAndVecs"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAndVecs, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAndVecs)},
+  {__Pyx_NAMESTR("cvCornerMinEigenVal"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenVal)},
+  {__Pyx_NAMESTR("cvCornerHarris"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvCornerHarris)},
+  {__Pyx_NAMESTR("cvFindCornerSubPix"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPix)},
+  {__Pyx_NAMESTR("cvGoodFeaturesToTrack"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTrack, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTrack)},
+  {__Pyx_NAMESTR("cvGetRectSubPix"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPix)},
+  {__Pyx_NAMESTR("cvGetQuadrangleSubPix"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubPix, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubPix)},
+  {__Pyx_NAMESTR("cvResize"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvResize, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvResize)},
+  {__Pyx_NAMESTR("cvWarpAffine"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvWarpAffine)},
+  {__Pyx_NAMESTR("cvWarpPerspective"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspective)},
+  {__Pyx_NAMESTR("cvLogPolar"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvLogPolar, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+  {__Pyx_NAMESTR("cvErode"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvErode, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+  {__Pyx_NAMESTR("cvDilate"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDilate, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+  {__Pyx_NAMESTR("cvMorphologyEx"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvMorphologyEx, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+  {__Pyx_NAMESTR("cvSmooth"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvSmooth)},
+  {__Pyx_NAMESTR("cvFilter2D"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+  {__Pyx_NAMESTR("cvIntegral"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+  {__Pyx_NAMESTR("cvCalibrateCamera2"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+  {__Pyx_NAMESTR("cvFindChessboardCorners"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners)},
+  {__Pyx_NAMESTR("cvDrawChessboardCorners"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners)},
+  {0, 0, 0, 0}
+};
+=======
     /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":702
  * 
  *     for childname in descr.names:
@@ -10745,6 +17526,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc
     __Pyx_DECREF(((PyObject *)__pyx_v_fields));
     __pyx_v_fields = ((PyObject *)__pyx_1);
     __pyx_1 = 0;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 
     /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":703
  *     for childname in descr.names:
@@ -10769,6 +17551,60 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc
       {__pyx_filename = __pyx_f[1]; __pyx_lineno = 703; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     }
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+char* __pyx_import_star_type_names[] = {
+  "cvErodePtr",
+  "IplImage",
+  "cvFindCornerSubPixPtr",
+  "va_list",
+  "cvCornerEigenValsAndVecsPtr",
+  "_IplConvKernel",
+  "cvCannyPtr",
+  "cvResizePtr",
+  "INT8_t",
+  "cvIntegralPtr",
+  "Py_complex",
+  "_IplImage",
+  "FILE",
+  "cvFilter2DPtr",
+  "cvGoodFeaturesToTrackPtr",
+  "cvCalibrateCamera2Ptr",
+  "cvGetRectSubPixPtr",
+  "_inittab",
+  "UINT8_t",
+  "cvWarpAffinePtr",
+  "cvCornerHarrisPtr",
+  "cvDilatePtr",
+  "CvScalar",
+  "cvSobelPtr",
+  "INT16_t",
+  "FLOAT64_t",
+  "CvMat_uProxy",
+  "FLOAT32_t",
+  "IplConvKernel",
+  "INT32_t",
+  "PyTypeObject",
+  "cvLogPolarPtr",
+  "CvTermCriteria",
+  "CvMat",
+  "PyObject",
+  "cvMorphologyExPtr",
+  "cvLaplacePtr",
+  "cvFindChessboardCornersPtr",
+  "cvCornerMinEigenValPtr",
+  "cvDrawChessboardCornersPtr",
+  "cvWarpPerspectivePtr",
+  "cvGetQuadrangleSubPixPtr",
+  "CvPoint2D32f",
+  "CvSize",
+  "cvPreCorneDetectPtr",
+  "PY_LONG_LONG",
+  "CvPoint",
+  "cvSmoothPtr",
+  "Py_UNICODE",
+  0
+};
+=======
     /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":705
  *         child, new_offset = fields
  * 
@@ -10793,6 +17629,7 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc
     __pyx_t_6 = __Pyx_PyObject_IsTrue(__pyx_t_5); if (unlikely(__pyx_t_6 < 0)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 705; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
     __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0;
     if (__pyx_t_6) {
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 
       /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":706
  * 
@@ -10814,7 +17651,120 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc
       {__pyx_filename = __pyx_f[1]; __pyx_lineno = 706; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
       goto __pyx_L5;
     }
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+    type_name++;
+  }
+  if (0);
+  else if (__Pyx_StrEq(name, "c_cvSmooth")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvSmooth to scikits.image.opencv.opencv_cv.cvSmoothPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvCanny")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCanny to scikits.image.opencv.opencv_cv.cvCannyPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvCornerMinEigenVal")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCornerMinEigenVal to scikits.image.opencv.opencv_cv.cvCornerMinEigenValPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvErode")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvErode to scikits.image.opencv.opencv_cv.cvErodePtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvFilter2D")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvFilter2D to scikits.image.opencv.opencv_cv.cvFilter2DPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvFindChessboardCorners")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvFindChessboardCorners to scikits.image.opencv.opencv_cv.cvFindChessboardCornersPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvGetRectSubPix")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvGetRectSubPix to scikits.image.opencv.opencv_cv.cvGetRectSubPixPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvResize")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvResize to scikits.image.opencv.opencv_cv.cvResizePtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvGoodFeaturesToTrack")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvGoodFeaturesToTrack to scikits.image.opencv.opencv_cv.cvGoodFeaturesToTrackPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvCornerEigenValsAndVecs")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCornerEigenValsAndVecs to scikits.image.opencv.opencv_cv.cvCornerEigenValsAndVecsPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvPreCornerDetect")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvPreCornerDetect to scikits.image.opencv.opencv_cv.cvPreCorneDetectPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvGetQuadrangleSubPix")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvGetQuadrangleSubPix to scikits.image.opencv.opencv_cv.cvGetQuadrangleSubPixPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvLogPolar")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvLogPolar to scikits.image.opencv.opencv_cv.cvLogPolarPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvLaplace")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvLaplace to scikits.image.opencv.opencv_cv.cvLaplacePtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvMorphologyEx")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvMorphologyEx to scikits.image.opencv.opencv_cv.cvMorphologyExPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvCornerHarris")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCornerHarris to scikits.image.opencv.opencv_cv.cvCornerHarrisPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvWarpAffine")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvWarpAffine to scikits.image.opencv.opencv_cv.cvWarpAffinePtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvCalibrateCamera2")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCalibrateCamera2 to scikits.image.opencv.opencv_cv.cvCalibrateCamera2Ptr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvSobel")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvSobel to scikits.image.opencv.opencv_cv.cvSobelPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvDrawChessboardCorners")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvDrawChessboardCorners to scikits.image.opencv.opencv_cv.cvDrawChessboardCornersPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvDilate")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvDilate to scikits.image.opencv.opencv_cv.cvDilatePtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvWarpPerspective")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvWarpPerspective to scikits.image.opencv.opencv_cv.cvWarpPerspectivePtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvFindCornerSubPix")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvFindCornerSubPix to scikits.image.opencv.opencv_cv.cvFindCornerSubPixPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvIntegral")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvIntegral to scikits.image.opencv.opencv_cv.cvIntegralPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else {
+    if (PyObject_SetAttr(__pyx_m, py_name, o) < 0) goto bad;
+  }
+  return 0;
+  __pyx_L2_error:;
+  __Pyx_AddTraceback("scikits.image.opencv.opencv_cv");
+  bad:
+  Py_DECREF(o);
+  return -1;
+}
+
+=======
     __pyx_L5:;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 
     /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":708
  *             raise RuntimeError("Format string allocated too short, see comment in numpy.pxd")
@@ -10924,6 +17874,181 @@ static INLINE char *__pyx_f_5numpy__util_dtypestring(PyArray_Descr *__pyx_v_desc
  */
     (__pyx_v_offset[0]) += __pyx_v_child->elsize;
 
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+#if PY_MAJOR_VERSION >= 3
+static struct PyModuleDef __pyx_moduledef = {
+    PyModuleDef_HEAD_INIT,
+    __Pyx_NAMESTR("opencv_cv"),
+    0, /* m_doc */
+    -1, /* m_size */
+    __pyx_methods /* m_methods */,
+    NULL, /* m_reload */
+    NULL, /* m_traverse */
+    NULL, /* m_clear */
+    NULL /* m_free */
+};
+#endif
+
+static __Pyx_StringTabEntry __pyx_string_tab[] = {
+  {&__pyx_kp___main__, __pyx_k___main__, sizeof(__pyx_k___main__), 1, 1, 1},
+  {&__pyx_kp_src, __pyx_k_src, sizeof(__pyx_k_src), 1, 1, 1},
+  {&__pyx_kp_out, __pyx_k_out, sizeof(__pyx_k_out), 1, 1, 1},
+  {&__pyx_kp_xorder, __pyx_k_xorder, sizeof(__pyx_k_xorder), 1, 1, 1},
+  {&__pyx_kp_yorder, __pyx_k_yorder, sizeof(__pyx_k_yorder), 1, 1, 1},
+  {&__pyx_kp_aperture_size, __pyx_k_aperture_size, sizeof(__pyx_k_aperture_size), 1, 1, 1},
+  {&__pyx_kp_31, __pyx_k_31, sizeof(__pyx_k_31), 1, 1, 1},
+  {&__pyx_kp_32, __pyx_k_32, sizeof(__pyx_k_32), 1, 1, 1},
+  {&__pyx_kp_block_size, __pyx_k_block_size, sizeof(__pyx_k_block_size), 1, 1, 1},
+  {&__pyx_kp_k, __pyx_k_k, sizeof(__pyx_k_k), 1, 1, 1},
+  {&__pyx_kp_corners, __pyx_k_corners, sizeof(__pyx_k_corners), 1, 1, 1},
+  {&__pyx_kp_count, __pyx_k_count, sizeof(__pyx_k_count), 1, 1, 1},
+  {&__pyx_kp_win, __pyx_k_win, sizeof(__pyx_k_win), 1, 1, 1},
+  {&__pyx_kp_zero_zone, __pyx_k_zero_zone, sizeof(__pyx_k_zero_zone), 1, 1, 1},
+  {&__pyx_kp_iterations, __pyx_k_iterations, sizeof(__pyx_k_iterations), 1, 1, 1},
+  {&__pyx_kp_epsilon, __pyx_k_epsilon, sizeof(__pyx_k_epsilon), 1, 1, 1},
+  {&__pyx_kp_corner_count, __pyx_k_corner_count, sizeof(__pyx_k_corner_count), 1, 1, 1},
+  {&__pyx_kp_quality_level, __pyx_k_quality_level, sizeof(__pyx_k_quality_level), 1, 1, 1},
+  {&__pyx_kp_min_distance, __pyx_k_min_distance, sizeof(__pyx_k_min_distance), 1, 1, 1},
+  {&__pyx_kp_mask, __pyx_k_mask, sizeof(__pyx_k_mask), 1, 1, 1},
+  {&__pyx_kp_use_harris, __pyx_k_use_harris, sizeof(__pyx_k_use_harris), 1, 1, 1},
+  {&__pyx_kp_size, __pyx_k_size, sizeof(__pyx_k_size), 1, 1, 1},
+  {&__pyx_kp_center, __pyx_k_center, sizeof(__pyx_k_center), 1, 1, 1},
+  {&__pyx_kp_warpmat, __pyx_k_warpmat, sizeof(__pyx_k_warpmat), 1, 1, 1},
+  {&__pyx_kp_float_out, __pyx_k_float_out, sizeof(__pyx_k_float_out), 1, 1, 1},
+  {&__pyx_kp_height, __pyx_k_height, sizeof(__pyx_k_height), 1, 1, 1},
+  {&__pyx_kp_width, __pyx_k_width, sizeof(__pyx_k_width), 1, 1, 1},
+  {&__pyx_kp_method, __pyx_k_method, sizeof(__pyx_k_method), 1, 1, 1},
+  {&__pyx_kp_flags, __pyx_k_flags, sizeof(__pyx_k_flags), 1, 1, 1},
+  {&__pyx_kp_fillval, __pyx_k_fillval, sizeof(__pyx_k_fillval), 1, 1, 1},
+  {&__pyx_kp_M, __pyx_k_M, sizeof(__pyx_k_M), 1, 1, 1},
+  {&__pyx_kp_element, __pyx_k_element, sizeof(__pyx_k_element), 1, 1, 1},
+  {&__pyx_kp_anchor, __pyx_k_anchor, sizeof(__pyx_k_anchor), 1, 1, 1},
+  {&__pyx_kp_in_place, __pyx_k_in_place, sizeof(__pyx_k_in_place), 1, 1, 1},
+  {&__pyx_kp_operation, __pyx_k_operation, sizeof(__pyx_k_operation), 1, 1, 1},
+  {&__pyx_kp_smoothtype, __pyx_k_smoothtype, sizeof(__pyx_k_smoothtype), 1, 1, 1},
+  {&__pyx_kp_33, __pyx_k_33, sizeof(__pyx_k_33), 1, 1, 1},
+  {&__pyx_kp_34, __pyx_k_34, sizeof(__pyx_k_34), 1, 1, 1},
+  {&__pyx_kp_35, __pyx_k_35, sizeof(__pyx_k_35), 1, 1, 1},
+  {&__pyx_kp_36, __pyx_k_36, sizeof(__pyx_k_36), 1, 1, 1},
+  {&__pyx_kp_kernel, __pyx_k_kernel, sizeof(__pyx_k_kernel), 1, 1, 1},
+  {&__pyx_kp_square_sum, __pyx_k_square_sum, sizeof(__pyx_k_square_sum), 1, 1, 1},
+  {&__pyx_kp_tilted_sum, __pyx_k_tilted_sum, sizeof(__pyx_k_tilted_sum), 1, 1, 1},
+  {&__pyx_kp_object_points, __pyx_k_object_points, sizeof(__pyx_k_object_points), 1, 1, 1},
+  {&__pyx_kp_image_points, __pyx_k_image_points, sizeof(__pyx_k_image_points), 1, 1, 1},
+  {&__pyx_kp_point_counts, __pyx_k_point_counts, sizeof(__pyx_k_point_counts), 1, 1, 1},
+  {&__pyx_kp_image_size, __pyx_k_image_size, sizeof(__pyx_k_image_size), 1, 1, 1},
+  {&__pyx_kp_pattern_size, __pyx_k_pattern_size, sizeof(__pyx_k_pattern_size), 1, 1, 1},
+  {&__pyx_kp_ctypes, __pyx_k_ctypes, sizeof(__pyx_k_ctypes), 1, 1, 1},
+  {&__pyx_kp_numpy, __pyx_k_numpy, sizeof(__pyx_k_numpy), 1, 1, 1},
+  {&__pyx_kp_np, __pyx_k_np, sizeof(__pyx_k_np), 0, 1, 1},
+  {&__pyx_kp_opencv_backend, __pyx_k_opencv_backend, sizeof(__pyx_k_opencv_backend), 1, 1, 1},
+  {&__pyx_kp_37, __pyx_k_37, sizeof(__pyx_k_37), 1, 1, 1},
+  {&__pyx_kp_opencv_constants, __pyx_k_opencv_constants, sizeof(__pyx_k_opencv_constants), 1, 1, 1},
+  {&__pyx_kp_opencv_cv, __pyx_k_opencv_cv, sizeof(__pyx_k_opencv_cv), 1, 1, 1},
+  {&__pyx_kp__libimport, __pyx_k__libimport, sizeof(__pyx_k__libimport), 1, 1, 1},
+  {&__pyx_kp_cv, __pyx_k_cv, sizeof(__pyx_k_cv), 1, 1, 1},
+  {&__pyx_kp_addressof, __pyx_k_addressof, sizeof(__pyx_k_addressof), 1, 1, 1},
+  {&__pyx_kp_cvSobel, __pyx_k_cvSobel, sizeof(__pyx_k_cvSobel), 1, 1, 1},
+  {&__pyx_kp_cvLaplace, __pyx_k_cvLaplace, sizeof(__pyx_k_cvLaplace), 1, 1, 1},
+  {&__pyx_kp_cvCanny, __pyx_k_cvCanny, sizeof(__pyx_k_cvCanny), 1, 1, 1},
+  {&__pyx_kp_cvPreCornerDetect, __pyx_k_cvPreCornerDetect, sizeof(__pyx_k_cvPreCornerDetect), 1, 1, 1},
+  {&__pyx_kp_38, __pyx_k_38, sizeof(__pyx_k_38), 1, 1, 1},
+  {&__pyx_kp_cvCornerMinEigenVal, __pyx_k_cvCornerMinEigenVal, sizeof(__pyx_k_cvCornerMinEigenVal), 1, 1, 1},
+  {&__pyx_kp_cvCornerHarris, __pyx_k_cvCornerHarris, sizeof(__pyx_k_cvCornerHarris), 1, 1, 1},
+  {&__pyx_kp_cvFindCornerSubPix, __pyx_k_cvFindCornerSubPix, sizeof(__pyx_k_cvFindCornerSubPix), 1, 1, 1},
+  {&__pyx_kp_39, __pyx_k_39, sizeof(__pyx_k_39), 1, 1, 1},
+  {&__pyx_kp_cvGetRectSubPix, __pyx_k_cvGetRectSubPix, sizeof(__pyx_k_cvGetRectSubPix), 1, 1, 1},
+  {&__pyx_kp_40, __pyx_k_40, sizeof(__pyx_k_40), 1, 1, 1},
+  {&__pyx_kp_cvResize, __pyx_k_cvResize, sizeof(__pyx_k_cvResize), 1, 1, 1},
+  {&__pyx_kp_cvWarpAffine, __pyx_k_cvWarpAffine, sizeof(__pyx_k_cvWarpAffine), 1, 1, 1},
+  {&__pyx_kp_cvWarpPerspective, __pyx_k_cvWarpPerspective, sizeof(__pyx_k_cvWarpPerspective), 1, 1, 1},
+  {&__pyx_kp_cvLogPolar, __pyx_k_cvLogPolar, sizeof(__pyx_k_cvLogPolar), 1, 1, 1},
+  {&__pyx_kp_cvErode, __pyx_k_cvErode, sizeof(__pyx_k_cvErode), 1, 1, 1},
+  {&__pyx_kp_cvDilate, __pyx_k_cvDilate, sizeof(__pyx_k_cvDilate), 1, 1, 1},
+  {&__pyx_kp_cvMorphologyEx, __pyx_k_cvMorphologyEx, sizeof(__pyx_k_cvMorphologyEx), 1, 1, 1},
+  {&__pyx_kp_cvSmooth, __pyx_k_cvSmooth, sizeof(__pyx_k_cvSmooth), 1, 1, 1},
+  {&__pyx_kp_41, __pyx_k_41, sizeof(__pyx_k_41), 1, 1, 1},
+  {&__pyx_kp_cvIntegral, __pyx_k_cvIntegral, sizeof(__pyx_k_cvIntegral), 1, 1, 1},
+  {&__pyx_kp_42, __pyx_k_42, sizeof(__pyx_k_42), 1, 1, 1},
+  {&__pyx_kp_43, __pyx_k_43, sizeof(__pyx_k_43), 1, 1, 1},
+  {&__pyx_kp_44, __pyx_k_44, sizeof(__pyx_k_44), 1, 1, 1},
+  {&__pyx_kp_CV_INTER_LINEAR, __pyx_k_CV_INTER_LINEAR, sizeof(__pyx_k_CV_INTER_LINEAR), 1, 1, 1},
+  {&__pyx_kp_48, __pyx_k_48, sizeof(__pyx_k_48), 1, 1, 1},
+  {&__pyx_kp_CV_GAUSSIAN, __pyx_k_CV_GAUSSIAN, sizeof(__pyx_k_CV_GAUSSIAN), 1, 1, 1},
+  {&__pyx_kp_62, __pyx_k_62, sizeof(__pyx_k_62), 1, 1, 1},
+  {&__pyx_kp_65, __pyx_k_65, sizeof(__pyx_k_65), 1, 1, 1},
+  {&__pyx_kp_66, __pyx_k_66, sizeof(__pyx_k_66), 1, 1, 1},
+  {&__pyx_kp_67, __pyx_k_67, sizeof(__pyx_k_67), 1, 1, 1},
+  {&__pyx_kp_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 1, 1, 1},
+  {&__pyx_kp_dtype, __pyx_k_dtype, sizeof(__pyx_k_dtype), 1, 1, 1},
+  {&__pyx_kp_69, __pyx_k_69, sizeof(__pyx_k_69), 1, 1, 1},
+  {&__pyx_kp_reshape, __pyx_k_reshape, sizeof(__pyx_k_reshape), 1, 1, 1},
+  {&__pyx_kp_shape, __pyx_k_shape, sizeof(__pyx_k_shape), 1, 1, 1},
+  {&__pyx_kp_range, __pyx_k_range, sizeof(__pyx_k_range), 1, 1, 1},
+  {&__pyx_kp_CV_MOP_OPEN, __pyx_k_CV_MOP_OPEN, sizeof(__pyx_k_CV_MOP_OPEN), 1, 1, 1},
+  {&__pyx_kp_CV_MOP_CLOSE, __pyx_k_CV_MOP_CLOSE, sizeof(__pyx_k_CV_MOP_CLOSE), 1, 1, 1},
+  {&__pyx_kp_CV_MOP_GRADIENT, __pyx_k_CV_MOP_GRADIENT, sizeof(__pyx_k_CV_MOP_GRADIENT), 1, 1, 1},
+  {&__pyx_kp_CV_MOP_TOPHAT, __pyx_k_CV_MOP_TOPHAT, sizeof(__pyx_k_CV_MOP_TOPHAT), 1, 1, 1},
+  {&__pyx_kp_CV_MOP_BLACKHAT, __pyx_k_CV_MOP_BLACKHAT, sizeof(__pyx_k_CV_MOP_BLACKHAT), 1, 1, 1},
+  {&__pyx_kp_RuntimeError, __pyx_k_RuntimeError, sizeof(__pyx_k_RuntimeError), 1, 1, 1},
+  {&__pyx_kp_CV_BLUR_NO_SCALE, __pyx_k_CV_BLUR_NO_SCALE, sizeof(__pyx_k_CV_BLUR_NO_SCALE), 1, 1, 1},
+  {&__pyx_kp_CV_BLUR, __pyx_k_CV_BLUR, sizeof(__pyx_k_CV_BLUR), 1, 1, 1},
+  {&__pyx_kp_91, __pyx_k_91, sizeof(__pyx_k_91), 1, 1, 1},
+  {&__pyx_kp_92, __pyx_k_92, sizeof(__pyx_k_92), 1, 1, 1},
+  {&__pyx_kp_append, __pyx_k_append, sizeof(__pyx_k_append), 1, 1, 1},
+  {&__pyx_kp_copy, __pyx_k_copy, sizeof(__pyx_k_copy), 1, 1, 1},
+  {&__pyx_kp_68, __pyx_k_68, sizeof(__pyx_k_68), 0, 0, 0},
+  {&__pyx_kp_70, __pyx_k_70, sizeof(__pyx_k_70), 0, 0, 0},
+  {&__pyx_kp_71, __pyx_k_71, sizeof(__pyx_k_71), 0, 0, 0},
+  {&__pyx_kp_72, __pyx_k_72, sizeof(__pyx_k_72), 0, 0, 0},
+  {&__pyx_kp_73, __pyx_k_73, sizeof(__pyx_k_73), 0, 0, 0},
+  {&__pyx_kp_74, __pyx_k_74, sizeof(__pyx_k_74), 0, 0, 0},
+  {&__pyx_kp_75, __pyx_k_75, sizeof(__pyx_k_75), 0, 0, 0},
+  {&__pyx_kp_76, __pyx_k_76, sizeof(__pyx_k_76), 0, 0, 0},
+  {&__pyx_kp_77, __pyx_k_77, sizeof(__pyx_k_77), 0, 0, 0},
+  {&__pyx_kp_78, __pyx_k_78, sizeof(__pyx_k_78), 0, 0, 0},
+  {&__pyx_kp_79, __pyx_k_79, sizeof(__pyx_k_79), 0, 0, 0},
+  {&__pyx_kp_80, __pyx_k_80, sizeof(__pyx_k_80), 0, 0, 0},
+  {&__pyx_kp_81, __pyx_k_81, sizeof(__pyx_k_81), 0, 0, 0},
+  {&__pyx_kp_82, __pyx_k_82, sizeof(__pyx_k_82), 0, 0, 0},
+  {&__pyx_kp_83, __pyx_k_83, sizeof(__pyx_k_83), 0, 0, 0},
+  {&__pyx_kp_84, __pyx_k_84, sizeof(__pyx_k_84), 0, 0, 0},
+  {&__pyx_kp_85, __pyx_k_85, sizeof(__pyx_k_85), 0, 0, 0},
+  {&__pyx_kp_86, __pyx_k_86, sizeof(__pyx_k_86), 0, 0, 0},
+  {&__pyx_kp_87, __pyx_k_87, sizeof(__pyx_k_87), 0, 0, 0},
+  {&__pyx_kp_88, __pyx_k_88, sizeof(__pyx_k_88), 0, 0, 0},
+  {&__pyx_kp_89, __pyx_k_89, sizeof(__pyx_k_89), 0, 0, 0},
+  {&__pyx_kp_90, __pyx_k_90, sizeof(__pyx_k_90), 0, 0, 0},
+  {&__pyx_kp___getbuffer__, __pyx_k___getbuffer__, sizeof(__pyx_k___getbuffer__), 1, 1, 1},
+  {&__pyx_kp___releasebuffer__, __pyx_k___releasebuffer__, sizeof(__pyx_k___releasebuffer__), 1, 1, 1},
+  {&__pyx_kp_info, __pyx_k_info, sizeof(__pyx_k_info), 1, 1, 1},
+  {&__pyx_kp_1, __pyx_k_1, sizeof(__pyx_k_1), 0, 0, 0},
+  {&__pyx_kp_2, __pyx_k_2, sizeof(__pyx_k_2), 0, 0, 0},
+  {&__pyx_kp_5, __pyx_k_5, sizeof(__pyx_k_5), 0, 0, 0},
+  {&__pyx_kp_23, __pyx_k_23, sizeof(__pyx_k_23), 0, 0, 0},
+  {&__pyx_kp_25, __pyx_k_25, sizeof(__pyx_k_25), 0, 0, 0},
+  {&__pyx_kp_28, __pyx_k_28, sizeof(__pyx_k_28), 0, 0, 0},
+  {&__pyx_kp_29, __pyx_k_29, sizeof(__pyx_k_29), 0, 0, 0},
+  {&__pyx_kp_30, __pyx_k_30, sizeof(__pyx_k_30), 0, 0, 0},
+  {0, 0, 0, 0, 0, 0}
+};
+static int __Pyx_InitCachedBuiltins(void) {
+  __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_kp_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_kp_range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 657; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_kp_RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  return 0;
+  __pyx_L1_error:;
+  return -1;
+}
+
+static int __Pyx_InitGlobals(void) {
+  __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+  __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+  __pyx_int_6 = PyInt_FromLong(6); if (unlikely(!__pyx_int_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+  __pyx_int_3 = PyInt_FromLong(3); if (unlikely(!__pyx_int_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+  __pyx_int_4 = PyInt_FromLong(4); if (unlikely(!__pyx_int_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+  __pyx_int_2 = PyInt_FromLong(2); if (unlikely(!__pyx_int_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+=======
     /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/numpy.pxd":727
  *         offset[0] += child.itemsize
  * 
@@ -11411,6 +18536,7 @@ static struct PyMethodDef __pyx_methods[] = {
   {__Pyx_NAMESTR("cvSmooth"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvSmooth, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvSmooth)},
   {__Pyx_NAMESTR("cvFilter2D"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFilter2D, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
   {__Pyx_NAMESTR("cvIntegral"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvIntegral, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
+  {__Pyx_NAMESTR("cvCvtColor"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCvtColor, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
   {__Pyx_NAMESTR("cvCalibrateCamera2"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(0)},
   {__Pyx_NAMESTR("cvFindChessboardCorners"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCorners)},
   {__Pyx_NAMESTR("cvDrawChessboardCorners"), (PyCFunction)__pyx_pf_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners, METH_VARARGS|METH_KEYWORDS, __Pyx_DOCSTR(__pyx_doc_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCorners)},
@@ -11428,6 +18554,7 @@ char* __pyx_import_star_type_names[] = {
   "_IplConvKernel",
   "cvCannyPtr",
   "cvResizePtr",
+  "cvCvtColorPtr",
   "INT8_t",
   "cvIntegralPtr",
   "Py_complex",
@@ -11484,99 +18611,103 @@ static int __pyx_import_star_set(PyObject *o, PyObject* py_name, char *name) {
   if (0);
   else if (__Pyx_StrEq(name, "c_cvSmooth")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvSmooth to scikits.image.opencv.opencv_cv.cvSmoothPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 218; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvCanny")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCanny to scikits.image.opencv.opencv_cv.cvCannyPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+  }
+  else if (__Pyx_StrEq(name, "c_cvCvtColor")) {
+    PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCvtColor to scikits.image.opencv.opencv_cv.cvCvtColorPtr");
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 233; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvCornerMinEigenVal")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCornerMinEigenVal to scikits.image.opencv.opencv_cv.cvCornerMinEigenValPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvErode")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvErode to scikits.image.opencv.opencv_cv.cvErodePtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 115; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 200; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvFilter2D")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvFilter2D to scikits.image.opencv.opencv_cv.cvFilter2DPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 138; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 223; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvFindChessboardCorners")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvFindChessboardCorners to scikits.image.opencv.opencv_cv.cvFindChessboardCornersPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 156; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 246; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvGetRectSubPix")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvGetRectSubPix to scikits.image.opencv.opencv_cv.cvGetRectSubPixPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvResize")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvResize to scikits.image.opencv.opencv_cv.cvResizePtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 177; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvGoodFeaturesToTrack")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvGoodFeaturesToTrack to scikits.image.opencv.opencv_cv.cvGoodFeaturesToTrackPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 159; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvCornerEigenValsAndVecs")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCornerEigenValsAndVecs to scikits.image.opencv.opencv_cv.cvCornerEigenValsAndVecsPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 132; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvPreCornerDetect")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvPreCornerDetect to scikits.image.opencv.opencv_cv.cvPreCorneDetectPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvGetQuadrangleSubPix")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvGetQuadrangleSubPix to scikits.image.opencv.opencv_cv.cvGetQuadrangleSubPixPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 171; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvLogPolar")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvLogPolar to scikits.image.opencv.opencv_cv.cvLogPolarPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 110; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 195; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvLaplace")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvLaplace to scikits.image.opencv.opencv_cv.cvLaplacePtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvMorphologyEx")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvMorphologyEx to scikits.image.opencv.opencv_cv.cvMorphologyExPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 126; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 211; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvCornerHarris")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCornerHarris to scikits.image.opencv.opencv_cv.cvCornerHarrisPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 144; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvWarpAffine")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvWarpAffine to scikits.image.opencv.opencv_cv.cvWarpAffinePtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 182; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvCalibrateCamera2")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvCalibrateCamera2 to scikits.image.opencv.opencv_cv.cvCalibrateCamera2Ptr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 149; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 239; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvSobel")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvSobel to scikits.image.opencv.opencv_cv.cvSobelPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 26; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvDrawChessboardCorners")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvDrawChessboardCorners to scikits.image.opencv.opencv_cv.cvDrawChessboardCornersPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 163; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 253; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvDilate")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvDilate to scikits.image.opencv.opencv_cv.cvDilatePtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 205; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvWarpPerspective")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvWarpPerspective to scikits.image.opencv.opencv_cv.cvWarpPerspectivePtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 104; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 189; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvFindCornerSubPix")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvFindCornerSubPix to scikits.image.opencv.opencv_cv.cvFindCornerSubPixPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 151; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else if (__Pyx_StrEq(name, "c_cvIntegral")) {
     PyErr_Format(PyExc_TypeError, "Cannot convert Python object c_cvIntegral to scikits.image.opencv.opencv_cv.cvIntegralPtr");
-    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 143; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
+    {__pyx_filename = __pyx_f[0]; __pyx_lineno = 228; __pyx_clineno = __LINE__; goto __pyx_L2_error;}
   }
   else {
     if (PyObject_SetAttr(__pyx_m, py_name, o) < 0) goto bad;
@@ -11749,6 +18880,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_kp_kernel, __pyx_k_kernel, sizeof(__pyx_k_kernel), 1, 1, 1},
   {&__pyx_kp_square_sum, __pyx_k_square_sum, sizeof(__pyx_k_square_sum), 1, 1, 1},
   {&__pyx_kp_tilted_sum, __pyx_k_tilted_sum, sizeof(__pyx_k_tilted_sum), 1, 1, 1},
+  {&__pyx_kp_code, __pyx_k_code, sizeof(__pyx_k_code), 1, 1, 1},
   {&__pyx_kp_object_points, __pyx_k_object_points, sizeof(__pyx_k_object_points), 1, 1, 1},
   {&__pyx_kp_image_points, __pyx_k_image_points, sizeof(__pyx_k_image_points), 1, 1, 1},
   {&__pyx_kp_point_counts, __pyx_k_point_counts, sizeof(__pyx_k_point_counts), 1, 1, 1},
@@ -11763,18 +18895,94 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_kp_opencv_cv, __pyx_k_opencv_cv, sizeof(__pyx_k_opencv_cv), 1, 1, 1},
   {&__pyx_kp__libimport, __pyx_k__libimport, sizeof(__pyx_k__libimport), 1, 1, 1},
   {&__pyx_kp_cv, __pyx_k_cv, sizeof(__pyx_k_cv), 1, 1, 1},
+  {&__pyx_kp_38, __pyx_k_38, sizeof(__pyx_k_38), 1, 1, 1},
+  {&__pyx_kp_39, __pyx_k_39, sizeof(__pyx_k_39), 1, 1, 1},
+  {&__pyx_kp_40, __pyx_k_40, sizeof(__pyx_k_40), 1, 1, 1},
+  {&__pyx_kp_41, __pyx_k_41, sizeof(__pyx_k_41), 1, 1, 1},
+  {&__pyx_kp_42, __pyx_k_42, sizeof(__pyx_k_42), 1, 1, 1},
+  {&__pyx_kp_43, __pyx_k_43, sizeof(__pyx_k_43), 1, 1, 1},
+  {&__pyx_kp_44, __pyx_k_44, sizeof(__pyx_k_44), 1, 1, 1},
+  {&__pyx_kp_45, __pyx_k_45, sizeof(__pyx_k_45), 1, 1, 1},
+  {&__pyx_kp_46, __pyx_k_46, sizeof(__pyx_k_46), 1, 1, 1},
+  {&__pyx_kp_47, __pyx_k_47, sizeof(__pyx_k_47), 1, 1, 1},
+  {&__pyx_kp_48, __pyx_k_48, sizeof(__pyx_k_48), 1, 1, 1},
+  {&__pyx_kp_49, __pyx_k_49, sizeof(__pyx_k_49), 1, 1, 1},
+  {&__pyx_kp_50, __pyx_k_50, sizeof(__pyx_k_50), 1, 1, 1},
+  {&__pyx_kp_51, __pyx_k_51, sizeof(__pyx_k_51), 1, 1, 1},
+  {&__pyx_kp_52, __pyx_k_52, sizeof(__pyx_k_52), 1, 1, 1},
+  {&__pyx_kp_53, __pyx_k_53, sizeof(__pyx_k_53), 1, 1, 1},
+  {&__pyx_kp_54, __pyx_k_54, sizeof(__pyx_k_54), 1, 1, 1},
+  {&__pyx_kp_55, __pyx_k_55, sizeof(__pyx_k_55), 1, 1, 1},
+  {&__pyx_kp_56, __pyx_k_56, sizeof(__pyx_k_56), 1, 1, 1},
+  {&__pyx_kp_57, __pyx_k_57, sizeof(__pyx_k_57), 1, 1, 1},
+  {&__pyx_kp_58, __pyx_k_58, sizeof(__pyx_k_58), 1, 1, 1},
+  {&__pyx_kp_59, __pyx_k_59, sizeof(__pyx_k_59), 1, 1, 1},
+  {&__pyx_kp_60, __pyx_k_60, sizeof(__pyx_k_60), 1, 1, 1},
+  {&__pyx_kp_61, __pyx_k_61, sizeof(__pyx_k_61), 1, 1, 1},
+  {&__pyx_kp_62, __pyx_k_62, sizeof(__pyx_k_62), 1, 1, 1},
+  {&__pyx_kp_63, __pyx_k_63, sizeof(__pyx_k_63), 1, 1, 1},
+  {&__pyx_kp_64, __pyx_k_64, sizeof(__pyx_k_64), 1, 1, 1},
+  {&__pyx_kp_65, __pyx_k_65, sizeof(__pyx_k_65), 1, 1, 1},
+  {&__pyx_kp_66, __pyx_k_66, sizeof(__pyx_k_66), 1, 1, 1},
+  {&__pyx_kp_67, __pyx_k_67, sizeof(__pyx_k_67), 1, 1, 1},
+  {&__pyx_kp_68, __pyx_k_68, sizeof(__pyx_k_68), 1, 1, 1},
+  {&__pyx_kp_69, __pyx_k_69, sizeof(__pyx_k_69), 1, 1, 1},
+  {&__pyx_kp_70, __pyx_k_70, sizeof(__pyx_k_70), 1, 1, 1},
+  {&__pyx_kp_71, __pyx_k_71, sizeof(__pyx_k_71), 1, 1, 1},
+  {&__pyx_kp_72, __pyx_k_72, sizeof(__pyx_k_72), 1, 1, 1},
+  {&__pyx_kp_73, __pyx_k_73, sizeof(__pyx_k_73), 1, 1, 1},
+  {&__pyx_kp_74, __pyx_k_74, sizeof(__pyx_k_74), 1, 1, 1},
+  {&__pyx_kp_75, __pyx_k_75, sizeof(__pyx_k_75), 1, 1, 1},
+  {&__pyx_kp_76, __pyx_k_76, sizeof(__pyx_k_76), 1, 1, 1},
+  {&__pyx_kp_77, __pyx_k_77, sizeof(__pyx_k_77), 1, 1, 1},
+  {&__pyx_kp_78, __pyx_k_78, sizeof(__pyx_k_78), 1, 1, 1},
+  {&__pyx_kp_79, __pyx_k_79, sizeof(__pyx_k_79), 1, 1, 1},
+  {&__pyx_kp_80, __pyx_k_80, sizeof(__pyx_k_80), 1, 1, 1},
+  {&__pyx_kp_81, __pyx_k_81, sizeof(__pyx_k_81), 1, 1, 1},
+  {&__pyx_kp_82, __pyx_k_82, sizeof(__pyx_k_82), 1, 1, 1},
+  {&__pyx_kp_83, __pyx_k_83, sizeof(__pyx_k_83), 1, 1, 1},
+  {&__pyx_kp_84, __pyx_k_84, sizeof(__pyx_k_84), 1, 1, 1},
+  {&__pyx_kp_85, __pyx_k_85, sizeof(__pyx_k_85), 1, 1, 1},
+  {&__pyx_kp_86, __pyx_k_86, sizeof(__pyx_k_86), 1, 1, 1},
+  {&__pyx_kp_87, __pyx_k_87, sizeof(__pyx_k_87), 1, 1, 1},
+  {&__pyx_kp_88, __pyx_k_88, sizeof(__pyx_k_88), 1, 1, 1},
+  {&__pyx_kp_89, __pyx_k_89, sizeof(__pyx_k_89), 1, 1, 1},
+  {&__pyx_kp_90, __pyx_k_90, sizeof(__pyx_k_90), 1, 1, 1},
+  {&__pyx_kp_91, __pyx_k_91, sizeof(__pyx_k_91), 1, 1, 1},
+  {&__pyx_kp_92, __pyx_k_92, sizeof(__pyx_k_92), 1, 1, 1},
+  {&__pyx_kp_93, __pyx_k_93, sizeof(__pyx_k_93), 1, 1, 1},
+  {&__pyx_kp_94, __pyx_k_94, sizeof(__pyx_k_94), 1, 1, 1},
+  {&__pyx_kp_95, __pyx_k_95, sizeof(__pyx_k_95), 1, 1, 1},
+  {&__pyx_kp_96, __pyx_k_96, sizeof(__pyx_k_96), 1, 1, 1},
+  {&__pyx_kp_97, __pyx_k_97, sizeof(__pyx_k_97), 1, 1, 1},
+  {&__pyx_kp_98, __pyx_k_98, sizeof(__pyx_k_98), 1, 1, 1},
+  {&__pyx_kp_99, __pyx_k_99, sizeof(__pyx_k_99), 1, 1, 1},
+  {&__pyx_kp_100, __pyx_k_100, sizeof(__pyx_k_100), 1, 1, 1},
+  {&__pyx_kp_101, __pyx_k_101, sizeof(__pyx_k_101), 1, 1, 1},
+  {&__pyx_kp_102, __pyx_k_102, sizeof(__pyx_k_102), 1, 1, 1},
+  {&__pyx_kp_103, __pyx_k_103, sizeof(__pyx_k_103), 1, 1, 1},
+  {&__pyx_kp_104, __pyx_k_104, sizeof(__pyx_k_104), 1, 1, 1},
+  {&__pyx_kp_105, __pyx_k_105, sizeof(__pyx_k_105), 1, 1, 1},
+  {&__pyx_kp_106, __pyx_k_106, sizeof(__pyx_k_106), 1, 1, 1},
+  {&__pyx_kp_107, __pyx_k_107, sizeof(__pyx_k_107), 1, 1, 1},
+  {&__pyx_kp_108, __pyx_k_108, sizeof(__pyx_k_108), 1, 1, 1},
+  {&__pyx_kp_109, __pyx_k_109, sizeof(__pyx_k_109), 1, 1, 1},
+  {&__pyx_kp_110, __pyx_k_110, sizeof(__pyx_k_110), 1, 1, 1},
+  {&__pyx_kp_111, __pyx_k_111, sizeof(__pyx_k_111), 1, 1, 1},
+  {&__pyx_kp_112, __pyx_k_112, sizeof(__pyx_k_112), 1, 1, 1},
+  {&__pyx_kp__cvtcolor_dict, __pyx_k__cvtcolor_dict, sizeof(__pyx_k__cvtcolor_dict), 1, 1, 1},
   {&__pyx_kp_addressof, __pyx_k_addressof, sizeof(__pyx_k_addressof), 1, 1, 1},
   {&__pyx_kp_cvSobel, __pyx_k_cvSobel, sizeof(__pyx_k_cvSobel), 1, 1, 1},
   {&__pyx_kp_cvLaplace, __pyx_k_cvLaplace, sizeof(__pyx_k_cvLaplace), 1, 1, 1},
   {&__pyx_kp_cvCanny, __pyx_k_cvCanny, sizeof(__pyx_k_cvCanny), 1, 1, 1},
   {&__pyx_kp_cvPreCornerDetect, __pyx_k_cvPreCornerDetect, sizeof(__pyx_k_cvPreCornerDetect), 1, 1, 1},
-  {&__pyx_kp_38, __pyx_k_38, sizeof(__pyx_k_38), 1, 1, 1},
+  {&__pyx_kp_113, __pyx_k_113, sizeof(__pyx_k_113), 1, 1, 1},
   {&__pyx_kp_cvCornerMinEigenVal, __pyx_k_cvCornerMinEigenVal, sizeof(__pyx_k_cvCornerMinEigenVal), 1, 1, 1},
   {&__pyx_kp_cvCornerHarris, __pyx_k_cvCornerHarris, sizeof(__pyx_k_cvCornerHarris), 1, 1, 1},
   {&__pyx_kp_cvFindCornerSubPix, __pyx_k_cvFindCornerSubPix, sizeof(__pyx_k_cvFindCornerSubPix), 1, 1, 1},
-  {&__pyx_kp_39, __pyx_k_39, sizeof(__pyx_k_39), 1, 1, 1},
+  {&__pyx_kp_114, __pyx_k_114, sizeof(__pyx_k_114), 1, 1, 1},
   {&__pyx_kp_cvGetRectSubPix, __pyx_k_cvGetRectSubPix, sizeof(__pyx_k_cvGetRectSubPix), 1, 1, 1},
-  {&__pyx_kp_40, __pyx_k_40, sizeof(__pyx_k_40), 1, 1, 1},
+  {&__pyx_kp_115, __pyx_k_115, sizeof(__pyx_k_115), 1, 1, 1},
   {&__pyx_kp_cvResize, __pyx_k_cvResize, sizeof(__pyx_k_cvResize), 1, 1, 1},
   {&__pyx_kp_cvWarpAffine, __pyx_k_cvWarpAffine, sizeof(__pyx_k_cvWarpAffine), 1, 1, 1},
   {&__pyx_kp_cvWarpPerspective, __pyx_k_cvWarpPerspective, sizeof(__pyx_k_cvWarpPerspective), 1, 1, 1},
@@ -11783,21 +18991,20 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_kp_cvDilate, __pyx_k_cvDilate, sizeof(__pyx_k_cvDilate), 1, 1, 1},
   {&__pyx_kp_cvMorphologyEx, __pyx_k_cvMorphologyEx, sizeof(__pyx_k_cvMorphologyEx), 1, 1, 1},
   {&__pyx_kp_cvSmooth, __pyx_k_cvSmooth, sizeof(__pyx_k_cvSmooth), 1, 1, 1},
-  {&__pyx_kp_41, __pyx_k_41, sizeof(__pyx_k_41), 1, 1, 1},
+  {&__pyx_kp_116, __pyx_k_116, sizeof(__pyx_k_116), 1, 1, 1},
   {&__pyx_kp_cvIntegral, __pyx_k_cvIntegral, sizeof(__pyx_k_cvIntegral), 1, 1, 1},
-  {&__pyx_kp_42, __pyx_k_42, sizeof(__pyx_k_42), 1, 1, 1},
-  {&__pyx_kp_43, __pyx_k_43, sizeof(__pyx_k_43), 1, 1, 1},
-  {&__pyx_kp_44, __pyx_k_44, sizeof(__pyx_k_44), 1, 1, 1},
+  {&__pyx_kp_cvCvtColor, __pyx_k_cvCvtColor, sizeof(__pyx_k_cvCvtColor), 1, 1, 1},
+  {&__pyx_kp_117, __pyx_k_117, sizeof(__pyx_k_117), 1, 1, 1},
+  {&__pyx_kp_118, __pyx_k_118, sizeof(__pyx_k_118), 1, 1, 1},
+  {&__pyx_kp_119, __pyx_k_119, sizeof(__pyx_k_119), 1, 1, 1},
   {&__pyx_kp_CV_INTER_LINEAR, __pyx_k_CV_INTER_LINEAR, sizeof(__pyx_k_CV_INTER_LINEAR), 1, 1, 1},
-  {&__pyx_kp_48, __pyx_k_48, sizeof(__pyx_k_48), 1, 1, 1},
+  {&__pyx_kp_123, __pyx_k_123, sizeof(__pyx_k_123), 1, 1, 1},
   {&__pyx_kp_CV_GAUSSIAN, __pyx_k_CV_GAUSSIAN, sizeof(__pyx_k_CV_GAUSSIAN), 1, 1, 1},
-  {&__pyx_kp_62, __pyx_k_62, sizeof(__pyx_k_62), 1, 1, 1},
-  {&__pyx_kp_65, __pyx_k_65, sizeof(__pyx_k_65), 1, 1, 1},
-  {&__pyx_kp_66, __pyx_k_66, sizeof(__pyx_k_66), 1, 1, 1},
-  {&__pyx_kp_67, __pyx_k_67, sizeof(__pyx_k_67), 1, 1, 1},
+  {&__pyx_kp_137, __pyx_k_137, sizeof(__pyx_k_137), 1, 1, 1},
+  {&__pyx_kp_140, __pyx_k_140, sizeof(__pyx_k_140), 1, 1, 1},
   {&__pyx_kp_ValueError, __pyx_k_ValueError, sizeof(__pyx_k_ValueError), 1, 1, 1},
   {&__pyx_kp_dtype, __pyx_k_dtype, sizeof(__pyx_k_dtype), 1, 1, 1},
-  {&__pyx_kp_69, __pyx_k_69, sizeof(__pyx_k_69), 1, 1, 1},
+  {&__pyx_kp_142, __pyx_k_142, sizeof(__pyx_k_142), 1, 1, 1},
   {&__pyx_kp_reshape, __pyx_k_reshape, sizeof(__pyx_k_reshape), 1, 1, 1},
   {&__pyx_kp_shape, __pyx_k_shape, sizeof(__pyx_k_shape), 1, 1, 1},
   {&__pyx_kp_range, __pyx_k_range, sizeof(__pyx_k_range), 1, 1, 1},
@@ -11809,32 +19016,34 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {&__pyx_kp_RuntimeError, __pyx_k_RuntimeError, sizeof(__pyx_k_RuntimeError), 1, 1, 1},
   {&__pyx_kp_CV_BLUR_NO_SCALE, __pyx_k_CV_BLUR_NO_SCALE, sizeof(__pyx_k_CV_BLUR_NO_SCALE), 1, 1, 1},
   {&__pyx_kp_CV_BLUR, __pyx_k_CV_BLUR, sizeof(__pyx_k_CV_BLUR), 1, 1, 1},
-  {&__pyx_kp_91, __pyx_k_91, sizeof(__pyx_k_91), 1, 1, 1},
-  {&__pyx_kp_92, __pyx_k_92, sizeof(__pyx_k_92), 1, 1, 1},
+  {&__pyx_kp_164, __pyx_k_164, sizeof(__pyx_k_164), 1, 1, 1},
+  {&__pyx_kp_165, __pyx_k_165, sizeof(__pyx_k_165), 1, 1, 1},
   {&__pyx_kp_append, __pyx_k_append, sizeof(__pyx_k_append), 1, 1, 1},
+  {&__pyx_kp_KeyError, __pyx_k_KeyError, sizeof(__pyx_k_KeyError), 1, 1, 1},
   {&__pyx_kp_copy, __pyx_k_copy, sizeof(__pyx_k_copy), 1, 1, 1},
-  {&__pyx_kp_68, __pyx_k_68, sizeof(__pyx_k_68), 0, 0, 0},
-  {&__pyx_kp_70, __pyx_k_70, sizeof(__pyx_k_70), 0, 0, 0},
-  {&__pyx_kp_71, __pyx_k_71, sizeof(__pyx_k_71), 0, 0, 0},
-  {&__pyx_kp_72, __pyx_k_72, sizeof(__pyx_k_72), 0, 0, 0},
-  {&__pyx_kp_73, __pyx_k_73, sizeof(__pyx_k_73), 0, 0, 0},
-  {&__pyx_kp_74, __pyx_k_74, sizeof(__pyx_k_74), 0, 0, 0},
-  {&__pyx_kp_75, __pyx_k_75, sizeof(__pyx_k_75), 0, 0, 0},
-  {&__pyx_kp_76, __pyx_k_76, sizeof(__pyx_k_76), 0, 0, 0},
-  {&__pyx_kp_77, __pyx_k_77, sizeof(__pyx_k_77), 0, 0, 0},
-  {&__pyx_kp_78, __pyx_k_78, sizeof(__pyx_k_78), 0, 0, 0},
-  {&__pyx_kp_79, __pyx_k_79, sizeof(__pyx_k_79), 0, 0, 0},
-  {&__pyx_kp_80, __pyx_k_80, sizeof(__pyx_k_80), 0, 0, 0},
-  {&__pyx_kp_81, __pyx_k_81, sizeof(__pyx_k_81), 0, 0, 0},
-  {&__pyx_kp_82, __pyx_k_82, sizeof(__pyx_k_82), 0, 0, 0},
-  {&__pyx_kp_83, __pyx_k_83, sizeof(__pyx_k_83), 0, 0, 0},
-  {&__pyx_kp_84, __pyx_k_84, sizeof(__pyx_k_84), 0, 0, 0},
-  {&__pyx_kp_85, __pyx_k_85, sizeof(__pyx_k_85), 0, 0, 0},
-  {&__pyx_kp_86, __pyx_k_86, sizeof(__pyx_k_86), 0, 0, 0},
-  {&__pyx_kp_87, __pyx_k_87, sizeof(__pyx_k_87), 0, 0, 0},
-  {&__pyx_kp_88, __pyx_k_88, sizeof(__pyx_k_88), 0, 0, 0},
-  {&__pyx_kp_89, __pyx_k_89, sizeof(__pyx_k_89), 0, 0, 0},
-  {&__pyx_kp_90, __pyx_k_90, sizeof(__pyx_k_90), 0, 0, 0},
+  {&__pyx_kp_141, __pyx_k_141, sizeof(__pyx_k_141), 0, 0, 0},
+  {&__pyx_kp_143, __pyx_k_143, sizeof(__pyx_k_143), 0, 0, 0},
+  {&__pyx_kp_144, __pyx_k_144, sizeof(__pyx_k_144), 0, 0, 0},
+  {&__pyx_kp_145, __pyx_k_145, sizeof(__pyx_k_145), 0, 0, 0},
+  {&__pyx_kp_146, __pyx_k_146, sizeof(__pyx_k_146), 0, 0, 0},
+  {&__pyx_kp_147, __pyx_k_147, sizeof(__pyx_k_147), 0, 0, 0},
+  {&__pyx_kp_148, __pyx_k_148, sizeof(__pyx_k_148), 0, 0, 0},
+  {&__pyx_kp_149, __pyx_k_149, sizeof(__pyx_k_149), 0, 0, 0},
+  {&__pyx_kp_150, __pyx_k_150, sizeof(__pyx_k_150), 0, 0, 0},
+  {&__pyx_kp_151, __pyx_k_151, sizeof(__pyx_k_151), 0, 0, 0},
+  {&__pyx_kp_152, __pyx_k_152, sizeof(__pyx_k_152), 0, 0, 0},
+  {&__pyx_kp_153, __pyx_k_153, sizeof(__pyx_k_153), 0, 0, 0},
+  {&__pyx_kp_154, __pyx_k_154, sizeof(__pyx_k_154), 0, 0, 0},
+  {&__pyx_kp_155, __pyx_k_155, sizeof(__pyx_k_155), 0, 0, 0},
+  {&__pyx_kp_156, __pyx_k_156, sizeof(__pyx_k_156), 0, 0, 0},
+  {&__pyx_kp_157, __pyx_k_157, sizeof(__pyx_k_157), 0, 0, 0},
+  {&__pyx_kp_158, __pyx_k_158, sizeof(__pyx_k_158), 0, 0, 0},
+  {&__pyx_kp_159, __pyx_k_159, sizeof(__pyx_k_159), 0, 0, 0},
+  {&__pyx_kp_160, __pyx_k_160, sizeof(__pyx_k_160), 0, 0, 0},
+  {&__pyx_kp_161, __pyx_k_161, sizeof(__pyx_k_161), 0, 0, 0},
+  {&__pyx_kp_162, __pyx_k_162, sizeof(__pyx_k_162), 0, 0, 0},
+  {&__pyx_kp_163, __pyx_k_163, sizeof(__pyx_k_163), 0, 0, 0},
+  {&__pyx_kp_166, __pyx_k_166, sizeof(__pyx_k_166), 0, 0, 0},
   {&__pyx_kp___getbuffer__, __pyx_k___getbuffer__, sizeof(__pyx_k___getbuffer__), 1, 1, 1},
   {&__pyx_kp___releasebuffer__, __pyx_k___releasebuffer__, sizeof(__pyx_k___releasebuffer__), 1, 1, 1},
   {&__pyx_kp_info, __pyx_k_info, sizeof(__pyx_k_info), 1, 1, 1},
@@ -11849,21 +19058,23 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = {
   {0, 0, 0, 0, 0, 0}
 };
 static int __Pyx_InitCachedBuiltins(void) {
-  __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_kp_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_kp_range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 657; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
-  __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_kp_RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 845; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_ValueError = __Pyx_GetName(__pyx_b, __pyx_kp_ValueError); if (!__pyx_builtin_ValueError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 274; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_range = __Pyx_GetName(__pyx_b, __pyx_kp_range); if (!__pyx_builtin_range) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 747; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_RuntimeError = __Pyx_GetName(__pyx_b, __pyx_kp_RuntimeError); if (!__pyx_builtin_RuntimeError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 935; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_builtin_KeyError = __Pyx_GetName(__pyx_b, __pyx_kp_KeyError); if (!__pyx_builtin_KeyError) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1129; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   return 0;
   __pyx_L1_error:;
   return -1;
 }
 
 static int __Pyx_InitGlobals(void) {
-  __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
-  __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
-  __pyx_int_6 = PyInt_FromLong(6); if (unlikely(!__pyx_int_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
   __pyx_int_3 = PyInt_FromLong(3); if (unlikely(!__pyx_int_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
   __pyx_int_4 = PyInt_FromLong(4); if (unlikely(!__pyx_int_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+  __pyx_int_1 = PyInt_FromLong(1); if (unlikely(!__pyx_int_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
   __pyx_int_2 = PyInt_FromLong(2); if (unlikely(!__pyx_int_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+  __pyx_int_neg_1 = PyInt_FromLong(-1); if (unlikely(!__pyx_int_neg_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+  __pyx_int_6 = PyInt_FromLong(6); if (unlikely(!__pyx_int_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __pyx_int_15 = PyInt_FromLong(15); if (unlikely(!__pyx_int_15)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
   if (__Pyx_InitStrings(__pyx_string_tab) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
   return 0;
@@ -11881,6 +19092,12 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
 {
   PyObject *__pyx_1 = 0;
   PyObject *__pyx_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+=======
+  PyObject *__pyx_3 = 0;
+  PyObject *__pyx_4 = 0;
+  PyObject *__pyx_5 = 0;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   PyObject *__pyx_t_1 = NULL;
   PyObject *__pyx_t_2 = NULL;
   PyObject *__pyx_t_3 = NULL;
@@ -11943,6 +19160,7 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_ptype_5numpy_broadcast = __Pyx_ImportType("numpy", "broadcast", sizeof(PyArrayMultiIterObject)); if (unlikely(!__pyx_ptype_5numpy_broadcast)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 133; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __pyx_ptype_5numpy_ndarray = __Pyx_ImportType("numpy", "ndarray", sizeof(PyArrayObject)); if (unlikely(!__pyx_ptype_5numpy_ndarray)) {__pyx_filename = __pyx_f[1]; __pyx_lineno = 137; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   /*--- Function import code ---*/
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_2 = __Pyx_ImportModule("scikits.image.opencv.opencv_backend"); if (!__pyx_2) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__Pyx_ImportFunction(__pyx_2, "populate_iplimage", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage, "void (PyArrayObject *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   if (__Pyx_ImportFunction(__pyx_2, "cvmat_ptr_from_iplimage", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage, "struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -11966,6 +19184,30 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   if (__Pyx_ImportFunction(__pyx_2, "free_IplConvKernel", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_free_IplConvKernel, "void (__pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   Py_DECREF(__pyx_2); __pyx_2 = 0;
   /*--- Execution code ---*/
+=======
+  __pyx_1 = __Pyx_ImportModule("scikits.image.opencv.opencv_backend"); if (!__pyx_1) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "populate_iplimage", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_populate_iplimage, "void (PyArrayObject *, __pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "cvmat_ptr_from_iplimage", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_cvmat_ptr_from_iplimage, "struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvMat *(__pyx_t_7scikits_5image_6opencv_11opencv_type_IplImage *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "validate_array", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_validate_array, "int (PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "assert_dtype", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_dtype, "int (PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "assert_ndims", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_ndims, "int (PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "assert_nchannels", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_nchannels, "int (PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "assert_same_dtype", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_dtype, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "assert_same_shape", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_shape, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "assert_same_width_and_height", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_same_width_and_height, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "assert_like", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_like, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "assert_not_sharing_data", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_assert_not_sharing_data, "int (PyArrayObject *, PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "new_array", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array, "PyArrayObject *(int, npy_intp *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "new_array_like", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like, "PyArrayObject *(PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "new_array_like_diff_dtype", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_new_array_like_diff_dtype, "PyArrayObject *(PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "get_array_nbytes", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_get_array_nbytes, "npy_intp (PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "clone_array_shape", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_clone_array_shape, "npy_intp *(PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "array_as_cvPoint2D32f_ptr", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_array_as_cvPoint2D32f_ptr, "struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvPoint2D32f *(PyArrayObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "get_cvTermCriteria", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_get_cvTermCriteria, "struct __pyx_t_7scikits_5image_6opencv_11opencv_type_CvTermCriteria (int, double)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "get_IplConvKernel_ptr_from_array", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_get_IplConvKernel_ptr_from_array, "__pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *(PyArrayObject *, PyObject *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  if (__Pyx_ImportFunction(__pyx_1, "free_IplConvKernel", (void (**)(void))&__pyx_f_7scikits_5image_6opencv_14opencv_backend_free_IplConvKernel, "void (__pyx_t_7scikits_5image_6opencv_11opencv_type_IplConvKernel *)") < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  Py_DECREF(__pyx_1); __pyx_1 = 0;
+  /*--- Execution code ---*/
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1
  * import ctypes             # <<<<<<<<<<<<<<
@@ -12086,17 +19328,2671 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
  * # setup numpy tables for this module
  * np.import_array()             # <<<<<<<<<<<<<<
  * 
- * ###################################
+ * #-------------------------------------------------------------------------------
  */
   import_array();
 
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":31
+ * # out type is always the same as in type
+ * 
+ * _cvtcolor_dict = {CV_BGR2BGRA: [3, 4, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2RGBA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_1 = PyDict_New(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_1));
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_38); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":32
+ * 
+ * _cvtcolor_dict = {CV_BGR2BGRA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2RGBA: [3, 4, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGRA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_42); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":33
+ * _cvtcolor_dict = {CV_BGR2BGRA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2RGBA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGBA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2RGBA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_43); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 33; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":34
+ *                   CV_RGB2RGBA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR2RGBA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2BGRA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_44); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 34; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":35
+ *                   CV_BGRA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2RGBA: [3, 4, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2BGRA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_45); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 35; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":36
+ *                   CV_RGBA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2RGBA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2BGRA: [3, 4, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGBA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_46); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 36; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":37
+ *                   CV_BGR2RGBA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2BGRA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGRA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_47); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 37; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":38
+ *                   CV_RGB2BGRA: [3, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 38; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":39
+ *                   CV_RGBA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2RGBA: [4, 4, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_49); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 39; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":40
+ *                   CV_BGRA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGRA2RGBA: [4, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2BGRA: [4, 4, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_50); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 40; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":41
+ *                   CV_BGR2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2RGBA: [4, 4, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGBA2BGRA: [4, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_51); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 41; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":42
+ *                   CV_RGB2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2RGBA: [4, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2BGRA: [4, 4, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_52); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 42; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":43
+ *                   CV_BGRA2RGBA: [4, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2BGRA: [4, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2BGR: [1, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_53); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":44
+ *                   CV_RGBA2BGRA: [4, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_GRAY2BGR: [1, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2RGB: [1, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_54); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 44; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":45
+ *                   CV_BGR2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2BGR: [1, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_GRAY2RGB: [1, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2BGRA: [1, 4, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_55); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 45; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":46
+ *                   CV_RGB2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2BGR: [1, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2RGB: [1, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_GRAY2BGRA: [1, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2RGBA: [1, 4, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_56); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 46; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":47
+ *                   CV_GRAY2BGR: [1, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2RGB: [1, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2BGRA: [1, 4, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_GRAY2RGBA: [1, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_57); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 47; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":48
+ *                   CV_GRAY2RGB: [1, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2BGRA: [1, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2RGBA: [1, 4, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGRA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_58); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 48; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":49
+ *                   CV_GRAY2BGRA: [1, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_GRAY2RGBA: [1, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGBA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2BGR565: [3, 2, [UINT8]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_59); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":50
+ *                   CV_GRAY2RGBA: [1, 4, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGRA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR2BGR565: [3, 2, [UINT8]],
+ *                   CV_RGB2BGR565: [3, 2, [UINT8]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_60); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 50; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":51
+ *                   CV_BGRA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGBA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2BGR565: [3, 2, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2BGR565: [3, 2, [UINT8]],
+ *                   CV_BGR5652BGR: [2, 3, [UINT8]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_61); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 51; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":52
+ *                   CV_RGBA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2BGR565: [3, 2, [UINT8]],
+ *                   CV_RGB2BGR565: [3, 2, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR5652BGR: [2, 3, [UINT8]],
+ *                   CV_BGR5652RGB: [2, 3, [UINT8]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_62); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_5 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 52; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":53
+ *                   CV_BGR2BGR565: [3, 2, [UINT8]],
+ *                   CV_RGB2BGR565: [3, 2, [UINT8]],
+ *                   CV_BGR5652BGR: [2, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR5652RGB: [2, 3, [UINT8]],
+ *                   CV_BGRA2BGR565: [4, 2, [UINT8]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_63); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_2 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 53; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":54
+ *                   CV_RGB2BGR565: [3, 2, [UINT8]],
+ *                   CV_BGR5652BGR: [2, 3, [UINT8]],
+ *                   CV_BGR5652RGB: [2, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGRA2BGR565: [4, 2, [UINT8]],
+ *                   CV_RGBA2BGR565: [4, 2, [UINT8]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_64); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 54; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":55
+ *                   CV_BGR5652BGR: [2, 3, [UINT8]],
+ *                   CV_BGR5652RGB: [2, 3, [UINT8]],
+ *                   CV_BGRA2BGR565: [4, 2, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_RGBA2BGR565: [4, 2, [UINT8]],
+ *                   CV_BGR5652BGRA: [2, 4, [UINT8]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_65); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":56
+ *                   CV_BGR5652RGB: [2, 3, [UINT8]],
+ *                   CV_BGRA2BGR565: [4, 2, [UINT8]],
+ *                   CV_RGBA2BGR565: [4, 2, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR5652BGRA: [2, 4, [UINT8]],
+ *                   CV_BGR5652RGBA: [2, 4, [UINT8]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_66); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_5 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 56; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":57
+ *                   CV_BGRA2BGR565: [4, 2, [UINT8]],
+ *                   CV_RGBA2BGR565: [4, 2, [UINT8]],
+ *                   CV_BGR5652BGRA: [2, 4, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR5652RGBA: [2, 4, [UINT8]],
+ *                   CV_GRAY2BGR565: [1, 2, [UINT8]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_67); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_2 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 57; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":58
+ *                   CV_RGBA2BGR565: [4, 2, [UINT8]],
+ *                   CV_BGR5652BGRA: [2, 4, [UINT8]],
+ *                   CV_BGR5652RGBA: [2, 4, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_GRAY2BGR565: [1, 2, [UINT8]],
+ *                   CV_BGR5652GRAY: [2, 1, [UINT8]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_68); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 58; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":59
+ *                   CV_BGR5652BGRA: [2, 4, [UINT8]],
+ *                   CV_BGR5652RGBA: [2, 4, [UINT8]],
+ *                   CV_GRAY2BGR565: [1, 2, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR5652GRAY: [2, 1, [UINT8]],
+ *                   CV_BGR2BGR555: [3, 2, [UINT8]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_69); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 59; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":60
+ *                   CV_BGR5652RGBA: [2, 4, [UINT8]],
+ *                   CV_GRAY2BGR565: [1, 2, [UINT8]],
+ *                   CV_BGR5652GRAY: [2, 1, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR2BGR555: [3, 2, [UINT8]],
+ *                   CV_RGB2BGR555: [3, 2, [UINT8]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_70); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_5 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 60; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":61
+ *                   CV_GRAY2BGR565: [1, 2, [UINT8]],
+ *                   CV_BGR5652GRAY: [2, 1, [UINT8]],
+ *                   CV_BGR2BGR555: [3, 2, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2BGR555: [3, 2, [UINT8]],
+ *                   CV_BGR5552BGR: [2, 3, [UINT8]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_71); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_2 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":62
+ *                   CV_BGR5652GRAY: [2, 1, [UINT8]],
+ *                   CV_BGR2BGR555: [3, 2, [UINT8]],
+ *                   CV_RGB2BGR555: [3, 2, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR5552BGR: [2, 3, [UINT8]],
+ *                   CV_BGR5552RGB: [2, 3, [UINT8]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_72); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 62; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":63
+ *                   CV_BGR2BGR555: [3, 2, [UINT8]],
+ *                   CV_RGB2BGR555: [3, 2, [UINT8]],
+ *                   CV_BGR5552BGR: [2, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR5552RGB: [2, 3, [UINT8]],
+ *                   CV_BGRA2BGR555: [4, 2, [UINT8]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_73); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 63; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":64
+ *                   CV_RGB2BGR555: [3, 2, [UINT8]],
+ *                   CV_BGR5552BGR: [2, 3, [UINT8]],
+ *                   CV_BGR5552RGB: [2, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGRA2BGR555: [4, 2, [UINT8]],
+ *                   CV_RGBA2BGR555: [4, 2, [UINT8]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_74); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_5 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 64; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":65
+ *                   CV_BGR5552BGR: [2, 3, [UINT8]],
+ *                   CV_BGR5552RGB: [2, 3, [UINT8]],
+ *                   CV_BGRA2BGR555: [4, 2, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_RGBA2BGR555: [4, 2, [UINT8]],
+ *                   CV_BGR5552BGRA: [2, 4, [UINT8]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_75); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_2 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 65; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":66
+ *                   CV_BGR5552RGB: [2, 3, [UINT8]],
+ *                   CV_BGRA2BGR555: [4, 2, [UINT8]],
+ *                   CV_RGBA2BGR555: [4, 2, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR5552BGRA: [2, 4, [UINT8]],
+ *                   CV_BGR5552RGBA: [2, 4, [UINT8]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_76); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 66; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":67
+ *                   CV_BGRA2BGR555: [4, 2, [UINT8]],
+ *                   CV_RGBA2BGR555: [4, 2, [UINT8]],
+ *                   CV_BGR5552BGRA: [2, 4, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR5552RGBA: [2, 4, [UINT8]],
+ *                   CV_GRAY2BGR555: [1, 2, [UINT8]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_77); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 67; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":68
+ *                   CV_RGBA2BGR555: [4, 2, [UINT8]],
+ *                   CV_BGR5552BGRA: [2, 4, [UINT8]],
+ *                   CV_BGR5552RGBA: [2, 4, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_GRAY2BGR555: [1, 2, [UINT8]],
+ *                   CV_BGR5552GRAY: [2, 1, [UINT8]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_78); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_5 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __Pyx_INCREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_4);
+  __Pyx_GIVEREF(__pyx_int_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":69
+ *                   CV_BGR5552BGRA: [2, 4, [UINT8]],
+ *                   CV_BGR5552RGBA: [2, 4, [UINT8]],
+ *                   CV_GRAY2BGR555: [1, 2, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR5552GRAY: [2, 1, [UINT8]],
+ *                   CV_BGR2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_79); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_2 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 69; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":70
+ *                   CV_BGR5552RGBA: [2, 4, [UINT8]],
+ *                   CV_GRAY2BGR555: [1, 2, [UINT8]],
+ *                   CV_BGR5552GRAY: [2, 1, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_80); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 70; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_2);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_2);
+  __Pyx_GIVEREF(__pyx_int_2);
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":71
+ *                   CV_GRAY2BGR555: [1, 2, [UINT8]],
+ *                   CV_BGR5552GRAY: [2, 1, [UINT8]],
+ *                   CV_BGR2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_XYZ2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_81); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 71; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":72
+ *                   CV_BGR5552GRAY: [2, 1, [UINT8]],
+ *                   CV_BGR2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_XYZ2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_XYZ2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_82); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 72; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":73
+ *                   CV_BGR2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_XYZ2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_XYZ2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_83); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 73; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":74
+ *                   CV_RGB2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_XYZ2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_XYZ2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_84); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 74; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":75
+ *                   CV_XYZ2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_XYZ2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_YCrCb2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_85); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 75; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":76
+ *                   CV_XYZ2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_YCrCb2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_YCrCb2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_86); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_4 = 0;
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":77
+ *                   CV_BGR2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_RGB2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_YCrCb2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_YCrCb2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2HSV: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_87); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_1, 2, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_5 = 0;
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 77; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":78
+ *                   CV_RGB2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_YCrCb2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_YCrCb2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR2HSV: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2HSV: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_88); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_40); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_2 = 0;
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 78; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":79
+ *                   CV_YCrCb2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_YCrCb2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2HSV: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2HSV: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_BGR2Lab: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_89); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 79; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":80
+ *                   CV_YCrCb2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+ *                   CV_BGR2HSV: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2HSV: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR2Lab: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2Lab: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_90); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 80; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":81
+ *                   CV_BGR2HSV: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2HSV: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_BGR2Lab: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2Lab: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_BayerBG2BGR: [1, 3, [UINT8]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_91); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 81; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":82
+ *                   CV_RGB2HSV: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_BGR2Lab: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2Lab: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BayerBG2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerGB2BGR: [1, 3, [UINT8]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_92); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":83
+ *                   CV_BGR2Lab: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2Lab: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_BayerBG2BGR: [1, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BayerGB2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerRG2BGR: [1, 3, [UINT8]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_93); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 83; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":84
+ *                   CV_RGB2Lab: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_BayerBG2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerGB2BGR: [1, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BayerRG2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerGR2BGR: [1, 3, [UINT8]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_94); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_5 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 84; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":85
+ *                   CV_BayerBG2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerGB2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerRG2BGR: [1, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BayerGR2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerBG2RGB: [1, 3, [UINT8]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_95); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_2 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 85; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":86
+ *                   CV_BayerGB2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerRG2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerGR2BGR: [1, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BayerBG2RGB: [1, 3, [UINT8]],
+ *                   CV_BayerGB2RGB: [1, 3, [UINT8]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_96); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 86; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":87
+ *                   CV_BayerRG2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerGR2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerBG2RGB: [1, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BayerGB2RGB: [1, 3, [UINT8]],
+ *                   CV_BayerRG2RGB: [1, 3, [UINT8]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_97); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  __pyx_3 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 87; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":88
+ *                   CV_BayerGR2BGR: [1, 3, [UINT8]],
+ *                   CV_BayerBG2RGB: [1, 3, [UINT8]],
+ *                   CV_BayerGB2RGB: [1, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BayerRG2RGB: [1, 3, [UINT8]],
+ *                   CV_BayerGR2RGB: [1, 3, [UINT8]],
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_98); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_5);
+  __Pyx_GIVEREF(__pyx_5);
+  __pyx_5 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_4, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":89
+ *                   CV_BayerBG2RGB: [1, 3, [UINT8]],
+ *                   CV_BayerGB2RGB: [1, 3, [UINT8]],
+ *                   CV_BayerRG2RGB: [1, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BayerGR2RGB: [1, 3, [UINT8]],
+ *                   CV_BGR2Luv: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_99); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_2);
+  __Pyx_GIVEREF(__pyx_2);
+  __pyx_2 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 89; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_3, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":90
+ *                   CV_BayerGB2RGB: [1, 3, [UINT8]],
+ *                   CV_BayerRG2RGB: [1, 3, [UINT8]],
+ *                   CV_BayerGR2RGB: [1, 3, [UINT8]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR2Luv: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2Luv: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_100); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 90; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_1);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_1);
+  __Pyx_GIVEREF(__pyx_int_1);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":91
+ *                   CV_BayerRG2RGB: [1, 3, [UINT8]],
+ *                   CV_BayerGR2RGB: [1, 3, [UINT8]],
+ *                   CV_BGR2Luv: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2Luv: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_BGR2HLS: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_101); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 91; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":92
+ *                   CV_BayerGR2RGB: [1, 3, [UINT8]],
+ *                   CV_BGR2Luv: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2Luv: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_BGR2HLS: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2HLS: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_102); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 92; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":93
+ *                   CV_BGR2Luv: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2Luv: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_BGR2HLS: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_RGB2HLS: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_HSV2BGR: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_103); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":94
+ *                   CV_RGB2Luv: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_BGR2HLS: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2HLS: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_HSV2BGR: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_HSV2RGB: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_104); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 94; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":95
+ *                   CV_BGR2HLS: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_RGB2HLS: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_HSV2BGR: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_HSV2RGB: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Lab2BGR: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_105); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 95; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":96
+ *                   CV_RGB2HLS: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_HSV2BGR: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_HSV2RGB: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_Lab2BGR: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Lab2RGB: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_106); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 96; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":12
+ * from opencv_constants import *
+ * 
+ * from opencv_constants import *             # <<<<<<<<<<<<<<
+ * from opencv_cv import *
+ * 
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":97
+ *                   CV_HSV2BGR: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_HSV2RGB: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Lab2BGR: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_Lab2RGB: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Luv2BGR: [3, 3, [UINT8, FLOAT32]],
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_107); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 97; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":13
+ * 
+ * from opencv_constants import *
+ * from opencv_cv import *             # <<<<<<<<<<<<<<
+ * 
+ * from _libimport import cv
+ */
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_kp_37);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_kp_37);
+  __Pyx_GIVEREF(__pyx_kp_37);
+  __pyx_1 = __Pyx_Import(__pyx_kp_opencv_cv, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  if (__pyx_import_star(__pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 13; __pyx_clineno = __LINE__; goto __pyx_L1_error;};
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":15
+ * from opencv_cv import *
+ * 
+ * from _libimport import cv             # <<<<<<<<<<<<<<
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":98
+ *                   CV_HSV2RGB: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Lab2BGR: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Lab2RGB: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_Luv2BGR: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Luv2RGB: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_108); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 98; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":99
+ *                   CV_Lab2BGR: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Lab2RGB: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Luv2BGR: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_Luv2RGB: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_HLS2BGR: [3, 3, [UINT8, FLOAT32]],
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_109); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":100
+ *                   CV_Lab2RGB: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Luv2BGR: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Luv2RGB: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_HLS2BGR: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_HLS2RGB: [3, 3, [UINT8, FLOAT32]]}
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_110); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 100; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":101
+ *                   CV_Luv2BGR: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_Luv2RGB: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_HLS2BGR: [3, 3, [UINT8, FLOAT32]],             # <<<<<<<<<<<<<<
+ *                   CV_HLS2RGB: [3, 3, [UINT8, FLOAT32]]}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
+  __pyx_t_1 = PyList_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_kp_cv);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_kp_cv);
+  __Pyx_GIVEREF(__pyx_kp_cv);
+  __pyx_1 = __Pyx_Import(__pyx_kp__libimport, ((PyObject *)__pyx_t_1)); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __pyx_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  if (PyObject_SetAttr(__pyx_m, __pyx_kp_cv, __pyx_2) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 15; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":18
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_111); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyList_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_2 = PyList_New(3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 101; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_2, 2, ((PyObject *)__pyx_t_1));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_1));
+  __pyx_t_1 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_2, ((PyObject *)__pyx_t_2)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":102
+ *                   CV_Luv2RGB: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_HLS2BGR: [3, 3, [UINT8, FLOAT32]],
+ *                   CV_HLS2RGB: [3, 3, [UINT8, FLOAT32]]}             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+ * 
+ * 
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_112); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_39); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_41); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyList_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyList_SET_ITEM(__pyx_t_2, 0, __pyx_3);
+  __Pyx_GIVEREF(__pyx_3);
+  PyList_SET_ITEM(__pyx_t_2, 1, __pyx_4);
+  __Pyx_GIVEREF(__pyx_4);
+  __pyx_3 = 0;
+  __pyx_4 = 0;
+  __pyx_t_1 = PyList_New(3); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 102; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 0, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  __Pyx_INCREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 1, __pyx_int_3);
+  __Pyx_GIVEREF(__pyx_int_3);
+  PyList_SET_ITEM(__pyx_t_1, 2, ((PyObject *)__pyx_t_2));
+  __Pyx_GIVEREF(((PyObject *)__pyx_t_2));
+  __pyx_t_2 = 0;
+  if (PyDict_SetItem(__pyx_1, __pyx_5, ((PyObject *)__pyx_t_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  if (PyObject_SetAttr(__pyx_m, __pyx_kp__cvtcolor_dict, ((PyObject *)__pyx_1)) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 31; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(((PyObject *)__pyx_1)); __pyx_1 = 0;
+
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":27
+=======
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":112
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * ctypedef void (*cvSobelPtr)(IplImage*, IplImage*, int, int, int)
  * cdef cvSobelPtr c_cvSobel
  * c_cvSobel = (<cvSobelPtr*><size_t>ctypes.addressof(cv.cvSobel))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvLaplace
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12108,10 +22004,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_3, __pyx_kp_cvSobel); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_3));
   PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 27; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -12121,12 +22031,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSobel = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvSobelPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":32
+=======
+  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 112; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSobel = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvSobelPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":117
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * ctypedef void (*cvLaplacePtr)(IplImage*, IplImage*, int)
  * cdef cvLaplacePtr c_cvLaplace
  * c_cvLaplace = (<cvLaplacePtr*><size_t>ctypes.addressof(cv.cvLaplace))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvCanny
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 32; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12184,9 +22106,39 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
  * cdef cvPreCorneDetectPtr c_cvPreCornerDetect
  * c_cvPreCornerDetect = (<cvPreCorneDetectPtr*><size_t>
  *                        ctypes.addressof(cv.cvPreCornerDetect))[0]             # <<<<<<<<<<<<<<
+=======
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_4, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_5, __pyx_kp_cvLaplace); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);
+  __Pyx_GIVEREF(__pyx_t_3);
+  __pyx_t_3 = 0;
+  __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 117; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvLaplace = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvLaplacePtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":122
+ * ctypedef void (*cvCannyPtr)(IplImage*, IplImage*, double, double, int)
+ * cdef cvCannyPtr c_cvCanny
+ * c_cvCanny = (<cvCannyPtr*><size_t>ctypes.addressof(cv.cvCanny))[0]             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- * # cvCornerEigenValsAndVecs
+ * # cvPreCornerDetect
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 43; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12214,9 +22166,39 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
  * cdef cvCornerEigenValsAndVecsPtr c_cvCornerEigenValsAndVecs
  * c_cvCornerEigenValsAndVecs = (<cvCornerEigenValsAndVecsPtr*><size_t>
  *                               ctypes.addressof(cv.cvCornerEigenValsAndVecs))[0]             # <<<<<<<<<<<<<<
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_2, __pyx_kp_cvCanny); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  __pyx_t_1 = 0;
+  __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCanny = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCannyPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":128
+ * cdef cvPreCorneDetectPtr c_cvPreCornerDetect
+ * c_cvPreCornerDetect = (<cvPreCorneDetectPtr*><size_t>
+ *                        ctypes.addressof(cv.cvPreCornerDetect))[0]             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
- * # cvCornerMinEigenVal
+ * # cvCornerEigenValsAndVecs
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12228,10 +22210,54 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_3, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_4, __pyx_kp_cvPreCornerDetect); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+  PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
+  __Pyx_GIVEREF(__pyx_t_2);
+  __pyx_t_2 = 0;
+  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvPreCornerDetect = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvPreCorneDetectPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":134
+ * cdef cvCornerEigenValsAndVecsPtr c_cvCornerEigenValsAndVecs
+ * c_cvCornerEigenValsAndVecs = (<cvCornerEigenValsAndVecsPtr*><size_t>
+ *                               ctypes.addressof(cv.cvCornerEigenValsAndVecs))[0]             # <<<<<<<<<<<<<<
+ * 
+ * # cvCornerMinEigenVal
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_5, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_1, __pyx_kp_113); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_1));
   PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_3);
   __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 49; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -12241,12 +22267,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerEigenValsAndVecs = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAndVecsPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":55
+=======
+  __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerEigenValsAndVecs = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerEigenValsAndVecsPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":140
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * cdef cvCornerMinEigenValPtr c_cvCornerMinEigenVal
  * c_cvCornerMinEigenVal = (<cvCornerMinEigenValPtr*><size_t>
  *                          ctypes.addressof(cv.cvCornerMinEigenVal))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvCornerHarris
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_3 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12258,10 +22296,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_3, __pyx_kp_cvCornerMinEigenVal); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 55; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -12271,12 +22323,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerMinEigenVal = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenValPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":61
+=======
+  __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 140; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerMinEigenVal = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerMinEigenValPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":146
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * cdef cvCornerHarrisPtr c_cvCornerHarris
  * c_cvCornerHarris = (<cvCornerHarrisPtr*><size_t>
  *                     ctypes.addressof(cv.cvCornerHarris))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvFindCornerSubPix
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12288,10 +22352,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_4, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_5, __pyx_kp_cvCornerHarris); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_3));
   PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 61; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -12301,12 +22379,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerHarris = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerHarrisPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":68
+=======
+  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 146; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCornerHarris = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCornerHarrisPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":153
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * cdef cvFindCornerSubPixPtr c_cvFindCornerSubPix
  * c_cvFindCornerSubPix = (<cvFindCornerSubPixPtr*>
  *                         <size_t>ctypes.addressof(cv.cvFindCornerSubPix))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvGoodFeaturesToTrack
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12318,10 +22408,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_2, __pyx_kp_cvFindCornerSubPix); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_1));
   PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_3);
   __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 68; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -12331,12 +22435,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindCornerSubPix = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPixPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":76
+=======
+  __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 153; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindCornerSubPix = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindCornerSubPixPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":161
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * cdef cvGoodFeaturesToTrackPtr c_cvGoodFeaturesToTrack
  * c_cvGoodFeaturesToTrack = (<cvGoodFeaturesToTrackPtr*><size_t>
  *                            ctypes.addressof(cv.cvGoodFeaturesToTrack))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvGetRectSubPix
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_3 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12348,10 +22464,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_3, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_4, __pyx_kp_114); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 76; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -12361,12 +22491,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGoodFeaturesToTrack = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTrackPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":82
+=======
+  __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 161; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGoodFeaturesToTrack = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvGoodFeaturesToTrackPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":167
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * cdef cvGetRectSubPixPtr c_cvGetRectSubPix
  * c_cvGetRectSubPix = (<cvGetRectSubPixPtr*><size_t>
  *                      ctypes.addressof(cv.cvGetRectSubPix))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvGetQuadrangleSubPix
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12378,10 +22520,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_5, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_cvGetRectSubPix); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_3));
   PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 82; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -12391,12 +22547,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGetRectSubPix = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPixPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":88
+=======
+  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 167; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGetRectSubPix = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvGetRectSubPixPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":173
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * cdef cvGetQuadrangleSubPixPtr c_cvGetQuadrangleSubPix
  * c_cvGetQuadrangleSubPix = (<cvGetQuadrangleSubPixPtr*><size_t>
  *                            ctypes.addressof(cv.cvGetQuadrangleSubPix))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvResize
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12408,10 +22576,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_3, __pyx_kp_115); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_1));
   PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_3);
   __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 88; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -12421,12 +22603,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGetQuadrangleSubPix = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubPixPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":93
+=======
+  __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 173; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvGetQuadrangleSubPix = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvGetQuadrangleSubPixPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":178
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * ctypedef void (*cvResizePtr)(IplImage*, IplImage*, int)
  * cdef cvResizePtr c_cvResize
  * c_cvResize = (<cvResizePtr*><size_t>ctypes.addressof(cv.cvResize))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvWarpAffine
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_3 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12438,10 +22632,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_4, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_5, __pyx_kp_cvResize); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 93; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -12451,12 +22659,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvResize = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvResizePtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":99
+=======
+  __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 178; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvResize = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvResizePtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":184
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * cdef cvWarpAffinePtr c_cvWarpAffine
  * c_cvWarpAffine = (<cvWarpAffinePtr*><size_t>
  *                   ctypes.addressof(cv.cvWarpAffine))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvWarpPerspective
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12468,10 +22688,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_2, __pyx_kp_cvWarpAffine); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_3));
   PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 99; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -12481,12 +22715,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvWarpAffine = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvWarpAffinePtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":106
+=======
+  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 184; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvWarpAffine = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvWarpAffinePtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":191
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * cdef cvWarpPerspectivePtr c_cvWarpPerspective
  * c_cvWarpPerspective = (<cvWarpPerspectivePtr*><size_t>
  *                        ctypes.addressof(cv.cvWarpPerspective))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvLogPolar
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12498,10 +22744,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_3, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_4, __pyx_kp_cvWarpPerspective); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_1));
   PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_3);
   __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 106; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -12511,12 +22771,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvWarpPerspective = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspectivePtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":111
+=======
+  __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 191; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvWarpPerspective = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvWarpPerspectivePtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":196
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * ctypedef void (*cvLogPolarPtr)(IplImage*, IplImage*, CvPoint2D32f, double, int)
  * cdef cvLogPolarPtr c_cvLogPolar
  * c_cvLogPolar = (<cvLogPolarPtr*><size_t>ctypes.addressof(cv.cvLogPolar))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvErode
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_3 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12528,10 +22800,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_5, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_cvLogPolar); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 111; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -12541,12 +22827,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvLogPolar = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvLogPolarPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":116
+=======
+  __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 196; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvLogPolar = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvLogPolarPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":201
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * ctypedef void (*cvErodePtr)(IplImage*, IplImage*, IplConvKernel*, int)
  * cdef cvErodePtr c_cvErode
  * c_cvErode = (<cvErodePtr*><size_t>ctypes.addressof(cv.cvErode))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvDilate
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12558,10 +22856,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 201; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 201; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 201; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_3, __pyx_kp_cvErode); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 201; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 201; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_3));
   PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 116; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -12571,12 +22883,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvErode = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvErodePtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":121
+=======
+  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 201; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 201; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvErode = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvErodePtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":206
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * ctypedef void (*cvDilatePtr)(IplImage*, IplImage*, IplConvKernel*, int)
  * cdef cvDilatePtr c_cvDilate
  * c_cvDilate = (<cvDilatePtr*><size_t>ctypes.addressof(cv.cvDilate))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvMorphologyEx
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12588,10 +22912,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_4, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_5, __pyx_kp_cvDilate); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_1));
   PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_3);
   __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -12601,11 +22939,23 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDilate = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDilatePtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":128
+=======
+  __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 206; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDilate = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDilatePtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":213
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * cdef cvMorphologyExPtr c_cvMorphologyEx
  * c_cvMorphologyEx = (<cvMorphologyExPtr*><size_t>
  *                         ctypes.addressof(cv.cvMorphologyEx))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvSmooth
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
  */
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
@@ -12618,10 +22968,115 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+ */
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_2, __pyx_kp_cvMorphologyEx); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_2));
   PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
   __Pyx_GIVEREF(__pyx_t_1);
   __pyx_t_1 = 0;
+  __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 213; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvMorphologyEx = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvMorphologyExPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":219
+ *                              int, double, double)
+ * cdef cvSmoothPtr c_cvSmooth
+ * c_cvSmooth =  (<cvSmoothPtr*><size_t>ctypes.addressof(cv.cvSmooth))[0]             # <<<<<<<<<<<<<<
+ * 
+ * # cvFilter2D
+ */
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_3, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_4, __pyx_kp_cvSmooth); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+  PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
+  __Pyx_GIVEREF(__pyx_t_2);
+  __pyx_t_2 = 0;
+  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 219; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvSmooth = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvSmoothPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":224
+ * ctypedef void (*cvFilter2DPtr)(IplImage*, IplImage*, CvMat*, CvPoint)
+ * cdef cvFilter2DPtr c_cvFilter2D
+ * c_cvFilter2D = (<cvFilter2DPtr*><size_t>ctypes.addressof(cv.cvFilter2D))[0]             # <<<<<<<<<<<<<<
+ * 
+ * # cvIntegral
+ */
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_5, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_1, __pyx_kp_116); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_1));
+  PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);
+  __Pyx_GIVEREF(__pyx_t_3);
+  __pyx_t_3 = 0;
+  __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 224; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFilter2D = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFilter2DPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":229
+ * ctypedef void (*cvIntegralPtr)(IplImage*, IplImage*, IplImage*, IplImage*)
+ * cdef cvIntegralPtr c_cvIntegral
+ * c_cvIntegral = (<cvIntegralPtr*><size_t>ctypes.addressof(cv.cvIntegral))[0]             # <<<<<<<<<<<<<<
+ * 
+ * # cvCvtColor
+ */
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_2, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_3, __pyx_kp_cvIntegral); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  __pyx_t_1 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 128; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
@@ -12634,9 +23089,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
  *                              int, double, double)
  * cdef cvSmoothPtr c_cvSmooth
  * c_cvSmooth =  (<cvSmoothPtr*><size_t>ctypes.addressof(cv.cvSmooth))[0]             # <<<<<<<<<<<<<<
+=======
+  __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 229; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvIntegral = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvIntegralPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":234
+ * ctypedef void (*cvCvtColorPtr)(IplImage*, IplImage*, int)
+ * cdef cvCvtColorPtr c_cvCvtColor
+ * c_cvCvtColor = (<cvCvtColorPtr*><size_t>ctypes.addressof(cv.cvCvtColor))[0]             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * # cvFilter2D
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_1 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12648,10 +23118,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_4, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_5, __pyx_kp_cvCvtColor); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_3));
   PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
   __Pyx_GIVEREF(__pyx_t_2);
   __pyx_t_2 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 134; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_2);
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
@@ -12664,9 +23148,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
  * ctypedef void (*cvFilter2DPtr)(IplImage*, IplImage*, CvMat*, CvPoint)
  * cdef cvFilter2DPtr c_cvFilter2D
  * c_cvFilter2D = (<cvFilter2DPtr*><size_t>ctypes.addressof(cv.cvFilter2D))[0]             # <<<<<<<<<<<<<<
+=======
+  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 234; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCvtColor = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCvtColorPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":241
+ * cdef cvCalibrateCamera2Ptr c_cvCalibrateCamera2
+ * c_cvCalibrateCamera2 = (<cvCalibrateCamera2Ptr*>
+ *                         <size_t>ctypes.addressof(cv.cvCalibrateCamera2))[0]             # <<<<<<<<<<<<<<
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * # cvIntegral
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12678,10 +23177,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
   __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+=======
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 241; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 241; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 241; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_2, __pyx_kp_117); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 241; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 241; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
   __Pyx_GOTREF(((PyObject *)__pyx_t_1));
   PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3);
   __Pyx_GIVEREF(__pyx_t_3);
   __pyx_t_3 = 0;
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 139; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_3);
   __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
@@ -12751,12 +23264,24 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCalibrateCamera2 = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2Ptr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":158
+=======
+  __pyx_t_3 = PyObject_Call(__pyx_t_2, ((PyObject *)__pyx_t_1), NULL); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 241; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_1)); __pyx_t_1 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_3); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 241; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvCalibrateCamera2 = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvCalibrateCamera2Ptr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":248
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * cdef cvFindChessboardCornersPtr c_cvFindChessboardCorners
  * c_cvFindChessboardCorners = (<cvFindChessboardCornersPtr*><size_t>
  *                              ctypes.addressof(cv.cvFindChessboardCorners))[0]             # <<<<<<<<<<<<<<
  * 
  * # cvDrawChessboardCorners
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 158; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12781,12 +23306,39 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":165
+=======
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_3 = PyObject_GetAttr(__pyx_3, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_4, __pyx_kp_118); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_t_2 = PyTuple_New(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  __pyx_t_1 = 0;
+  __pyx_t_1 = PyObject_Call(__pyx_t_3, ((PyObject *)__pyx_t_2), NULL); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_2)); __pyx_t_2 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_1); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 248; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvFindChessboardCorners = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvFindChessboardCornersPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":255
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * cdef cvDrawChessboardCornersPtr c_cvDrawChessboardCorners
  * c_cvDrawChessboardCorners = (<cvDrawChessboardCornersPtr*><size_t>
  *                              ctypes.addressof(cv.cvDrawChessboardCorners))[0]             # <<<<<<<<<<<<<<
  * 
  * ####################################
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_3 = PyObject_GetAttr(__pyx_1, __pyx_kp_addressof); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 165; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12811,12 +23363,39 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCornersPtr *)((size_t)__pyx_t_4))[0]);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":411
+=======
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_ctypes); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_1 = PyObject_GetAttr(__pyx_5, __pyx_kp_addressof); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_cv); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_2 = PyObject_GetAttr(__pyx_1, __pyx_kp_119); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_3));
+  PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2);
+  __Pyx_GIVEREF(__pyx_t_2);
+  __pyx_t_2 = 0;
+  __pyx_t_2 = PyObject_Call(__pyx_t_1, ((PyObject *)__pyx_t_3), NULL); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
+  __Pyx_DECREF(((PyObject *)__pyx_t_3)); __pyx_t_3 = 0;
+  __pyx_t_4 = __Pyx_PyInt_AsSize_t(__pyx_t_2); if (unlikely((__pyx_t_4 == (size_t)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 255; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_v_7scikits_5image_6opencv_9opencv_cv_c_cvDrawChessboardCorners = (((__pyx_t_7scikits_5image_6opencv_9opencv_cv_cvDrawChessboardCornersPtr *)((size_t)__pyx_t_4))[0]);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":501
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvFindCornerSubPix(np.ndarray src, np.ndarray corners, int count, win,
  *                        zero_zone=(-1, -1), int iterations=0,             # <<<<<<<<<<<<<<
  *                        double epsilon=1e-5):
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 411; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(((PyObject *)__pyx_t_1));
   __Pyx_INCREF(__pyx_int_neg_1);
@@ -12830,12 +23409,28 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GIVEREF(__pyx_k_45);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":548
+=======
+  __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 501; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  __Pyx_INCREF(__pyx_int_neg_1);
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_int_neg_1);
+  __Pyx_GIVEREF(__pyx_int_neg_1);
+  __Pyx_INCREF(__pyx_int_neg_1);
+  PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_int_neg_1);
+  __Pyx_GIVEREF(__pyx_int_neg_1);
+  __pyx_k_120 = ((PyObject *)__pyx_t_2);
+  __pyx_t_2 = 0;
+  __Pyx_GIVEREF(__pyx_k_120);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":638
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  *     return out
  * 
  * def cvGetQuadrangleSubPix(np.ndarray src, np.ndarray warpmat, float_out=False):             # <<<<<<<<<<<<<<
  *     ''' Retrieves the pixel quandrangle from an image with
  *     sub-pixel accuracy. In english: apply and affine transform to an image.
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 548; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_k_46 = __pyx_t_1;
@@ -12843,12 +23438,22 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GIVEREF(__pyx_k_46);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":597
+=======
+  __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 638; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_k_121 = __pyx_t_2;
+  __pyx_t_2 = 0;
+  __Pyx_GIVEREF(__pyx_k_121);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":687
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvResize(np.ndarray src, height=None, width=None,
  *              int method=CV_INTER_LINEAR):             # <<<<<<<<<<<<<<
  *     """
  *     better doc string needed.
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 597; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 597; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12856,12 +23461,22 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_k_47 = __pyx_t_5;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":628
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 687; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_2); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 687; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __pyx_k_122 = __pyx_t_5;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":718
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvWarpAffine(np.ndarray src, np.ndarray warpmat,
  *                  int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS,             # <<<<<<<<<<<<<<
  *                  fillval=(0., 0., 0., 0.)):
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 628; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 628; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12875,12 +23490,28 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_k_49 = __pyx_t_5;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":629
+=======
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_123); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_2 = PyNumber_Add(__pyx_3, __pyx_4); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 718; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_k_124 = __pyx_t_5;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":719
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * def cvWarpAffine(np.ndarray src, np.ndarray warpmat,
  *                  int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS,
  *                  fillval=(0., 0., 0., 0.)):             # <<<<<<<<<<<<<<
  * 
  *     ''' Applies an affine transformation to an image.
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 629; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_t_2 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 629; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12908,12 +23539,42 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GIVEREF(__pyx_k_50);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":677
+=======
+  __pyx_t_2 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_t_3 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __pyx_t_1 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_t_6 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_6);
+  __pyx_t_7 = PyTuple_New(4); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 719; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_7));
+  PyTuple_SET_ITEM(__pyx_t_7, 0, __pyx_t_2);
+  __Pyx_GIVEREF(__pyx_t_2);
+  PyTuple_SET_ITEM(__pyx_t_7, 1, __pyx_t_3);
+  __Pyx_GIVEREF(__pyx_t_3);
+  PyTuple_SET_ITEM(__pyx_t_7, 2, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  PyTuple_SET_ITEM(__pyx_t_7, 3, __pyx_t_6);
+  __Pyx_GIVEREF(__pyx_t_6);
+  __pyx_t_2 = 0;
+  __pyx_t_3 = 0;
+  __pyx_t_1 = 0;
+  __pyx_t_6 = 0;
+  __pyx_k_125 = ((PyObject *)__pyx_t_7);
+  __pyx_t_7 = 0;
+  __Pyx_GIVEREF(__pyx_k_125);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":767
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvWarpPerspective(np.ndarray src, np.ndarray warpmat,
  *                       int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS,             # <<<<<<<<<<<<<<
  *                       fillval=(0., 0., 0., 0.)):
  * 
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 677; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12927,12 +23588,28 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_k_51 = __pyx_t_5;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":678
+=======
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_123); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_1);
+  __pyx_t_7 = PyNumber_Add(__pyx_5, __pyx_1); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_7);
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __Pyx_DECREF(__pyx_1); __pyx_1 = 0;
+  __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_7); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 767; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
+  __pyx_k_126 = __pyx_t_5;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":768
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * def cvWarpPerspective(np.ndarray src, np.ndarray warpmat,
  *                       int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS,
  *                       fillval=(0., 0., 0., 0.)):             # <<<<<<<<<<<<<<
  * 
  *     ''' Applies a perspective transformation to an image.
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_7 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 678; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_7);
   __pyx_t_6 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 678; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12960,12 +23637,42 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GIVEREF(__pyx_k_52);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":725
+=======
+  __pyx_t_7 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_7)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_7);
+  __pyx_t_6 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_6)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_6);
+  __pyx_t_1 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_t_3 = PyFloat_FromDouble(0.0); if (unlikely(!__pyx_t_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_3);
+  __pyx_t_2 = PyTuple_New(4); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 768; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(((PyObject *)__pyx_t_2));
+  PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_7);
+  __Pyx_GIVEREF(__pyx_t_7);
+  PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_6);
+  __Pyx_GIVEREF(__pyx_t_6);
+  PyTuple_SET_ITEM(__pyx_t_2, 2, __pyx_t_1);
+  __Pyx_GIVEREF(__pyx_t_1);
+  PyTuple_SET_ITEM(__pyx_t_2, 3, __pyx_t_3);
+  __Pyx_GIVEREF(__pyx_t_3);
+  __pyx_t_7 = 0;
+  __pyx_t_6 = 0;
+  __pyx_t_1 = 0;
+  __pyx_t_3 = 0;
+  __pyx_k_127 = ((PyObject *)__pyx_t_2);
+  __pyx_t_2 = 0;
+  __Pyx_GIVEREF(__pyx_k_127);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":815
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvLogPolar(np.ndarray src, center, double M,
  *                int flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS):             # <<<<<<<<<<<<<<
  * 
  *     validate_array(src)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 725; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_2);
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_48); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 725; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -12979,12 +23686,28 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_k_53 = __pyx_t_5;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":745
+=======
+  __pyx_2 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_INTER_LINEAR); if (unlikely(!__pyx_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_2);
+  __pyx_3 = __Pyx_GetName(__pyx_m, __pyx_kp_123); if (unlikely(!__pyx_3)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_3);
+  __pyx_t_2 = PyNumber_Add(__pyx_2, __pyx_3); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __Pyx_DECREF(__pyx_2); __pyx_2 = 0;
+  __Pyx_DECREF(__pyx_3); __pyx_3 = 0;
+  __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_t_2); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 815; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0;
+  __pyx_k_128 = __pyx_t_5;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":835
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvErode(np.ndarray src, np.ndarray element=None, int iterations=1,
  *             anchor=None, in_place=False):             # <<<<<<<<<<<<<<
  * 
  *     validate_array(src)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 745; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_k_54 = __pyx_t_1;
@@ -12992,12 +23715,22 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GIVEREF(__pyx_k_54);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":777
+=======
+  __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 835; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_k_129 = __pyx_t_2;
+  __pyx_t_2 = 0;
+  __Pyx_GIVEREF(__pyx_k_129);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":867
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvDilate(np.ndarray src, np.ndarray element=None, int iterations=1,
  *             anchor=None, in_place=False):             # <<<<<<<<<<<<<<
  * 
  *     validate_array(src)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 777; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_k_55 = __pyx_t_1;
@@ -13005,12 +23738,22 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GIVEREF(__pyx_k_55);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":809
+=======
+  __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 867; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_k_130 = __pyx_t_2;
+  __pyx_t_2 = 0;
+  __Pyx_GIVEREF(__pyx_k_130);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":899
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvMorphologyEx(np.ndarray src, np.ndarray element, int operation,
  *                    int iterations=1, anchor=None, in_place=False):             # <<<<<<<<<<<<<<
  * 
  *     validate_array(src)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 809; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_k_56 = __pyx_t_1;
@@ -13058,11 +23801,48 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":978
  *         return out
+=======
+  __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 899; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_k_131 = __pyx_t_2;
+  __pyx_t_2 = 0;
+  __Pyx_GIVEREF(__pyx_k_131);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":948
+ * 
+ * def cvSmooth(np.ndarray src, np.ndarray out=None,
+ *              int smoothtype=CV_GAUSSIAN, int param1=3,             # <<<<<<<<<<<<<<
+ *              int param2=0, double param3=0, double param4=0,
+ *              bool in_place=False):
+ */
+  __pyx_4 = __Pyx_GetName(__pyx_m, __pyx_kp_CV_GAUSSIAN); if (unlikely(!__pyx_4)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_4);
+  __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_4); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 948; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_4); __pyx_4 = 0;
+  __pyx_k_132 = __pyx_t_5;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":950
+ *              int smoothtype=CV_GAUSSIAN, int param1=3,
+ *              int param2=0, double param3=0, double param4=0,
+ *              bool in_place=False):             # <<<<<<<<<<<<<<
+ *     """
+ *     better doc string needed.
+ */
+  __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  if (!(likely(PyBool_Check(__pyx_t_2)) || (__pyx_t_2) == Py_None || (PyErr_Format(PyExc_TypeError, "Expected bool, got %s", Py_TYPE(__pyx_t_2)->tp_name), 0))) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 950; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __pyx_k_133 = ((PyObject *)__pyx_t_2);
+  __Pyx_GIVEREF(__pyx_k_133);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1022
+ *     return out
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False):             # <<<<<<<<<<<<<<
  * 
  *     validate_array(src)
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 978; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_k_60 = __pyx_t_1;
@@ -13075,12 +23855,40 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __Pyx_GIVEREF(__pyx_k_61);
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1096
+=======
+  __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1022; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_k_134 = __pyx_t_2;
+  __pyx_t_2 = 0;
+  __Pyx_GIVEREF(__pyx_k_134);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1068
+ *         return out
+ * 
+ * def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False):             # <<<<<<<<<<<<<<
+ * 
+ *     validate_array(src)
+ */
+  __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_k_135 = __pyx_t_2;
+  __pyx_t_2 = 0;
+  __Pyx_GIVEREF(__pyx_k_135);
+  __pyx_t_2 = __Pyx_PyBool_FromLong(0); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1068; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_k_136 = __pyx_t_2;
+  __pyx_t_2 = 0;
+  __Pyx_GIVEREF(__pyx_k_136);
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1230
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvFindChessboardCorners(np.ndarray src, pattern_size,
  *                             int flags = CV_CALIB_CB_ADAPTIVE_THRESH):             # <<<<<<<<<<<<<<
  *     """
  *     Wrapper around the OpenCV cvFindChessboardCorners function.
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_1 = __Pyx_GetName(__pyx_m, __pyx_kp_62); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_1);
   __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_1); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1096; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
@@ -13088,17 +23896,34 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_k_63 = __pyx_t_5;
 
   /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1135
+=======
+  __pyx_5 = __Pyx_GetName(__pyx_m, __pyx_kp_137); if (unlikely(!__pyx_5)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_5);
+  __pyx_t_5 = __Pyx_PyInt_AsInt(__pyx_5); if (unlikely((__pyx_t_5 == (int)-1) && PyErr_Occurred())) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1230; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_DECREF(__pyx_5); __pyx_5 = 0;
+  __pyx_k_138 = __pyx_t_5;
+
+  /* "/home/brucewayne/scikits_image/scikits.image/scikits/image/opencv/opencv_cv.pyx":1269
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
  * 
  * def cvDrawChessboardCorners(np.ndarray src, pattern_size, np.ndarray corners,
  *                             in_place=True):             # <<<<<<<<<<<<<<
  *     """
  *     Wrapper around the OpenCV cvDrawChessboardCorners function.
  */
+<<<<<<< HEAD:scikits/image/opencv/opencv_cv.c
   __pyx_t_1 = __Pyx_PyBool_FromLong(1); if (unlikely(!__pyx_t_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1135; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
   __Pyx_GOTREF(__pyx_t_1);
   __pyx_k_64 = __pyx_t_1;
   __pyx_t_1 = 0;
   __Pyx_GIVEREF(__pyx_k_64);
+=======
+  __pyx_t_2 = __Pyx_PyBool_FromLong(1); if (unlikely(!__pyx_t_2)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 1269; __pyx_clineno = __LINE__; goto __pyx_L1_error;}
+  __Pyx_GOTREF(__pyx_t_2);
+  __pyx_k_139 = __pyx_t_2;
+  __pyx_t_2 = 0;
+  __Pyx_GIVEREF(__pyx_k_139);
+>>>>>>> cvtcolor:scikits/image/opencv/opencv_cv.c
 
   /* "/usr/local/lib/python2.6/dist-packages/Cython-0.11.3-py2.6-linux-x86_64.egg/Cython/Includes/python_mem.pxd":1
  * cdef extern from "Python.h":             # <<<<<<<<<<<<<<
@@ -13109,6 +23934,9 @@ PyMODINIT_FUNC PyInit_opencv_cv(void)
   __pyx_L1_error:;
   __Pyx_XDECREF(__pyx_1);
   __Pyx_XDECREF(__pyx_2);
+  __Pyx_XDECREF(__pyx_3);
+  __Pyx_XDECREF(__pyx_4);
+  __Pyx_XDECREF(__pyx_5);
   __Pyx_XDECREF(__pyx_t_1);
   __Pyx_XDECREF(__pyx_t_2);
   __Pyx_XDECREF(__pyx_t_3);
@@ -13275,6 +24103,41 @@ static int __Pyx_TypeTest(PyObject *obj, PyTypeObject *type) {
 }
 
 
+static int __Pyx_GetException(PyObject **type, PyObject **value, PyObject **tb) {
+    PyObject *tmp_type, *tmp_value, *tmp_tb;
+    PyThreadState *tstate = PyThreadState_GET();
+    *type = tstate->curexc_type;
+    *value = tstate->curexc_value;
+    *tb = tstate->curexc_traceback;
+    tstate->curexc_type = 0;
+    tstate->curexc_value = 0;
+    tstate->curexc_traceback = 0;
+    PyErr_NormalizeException(type, value, tb);
+    if (PyErr_Occurred())
+        goto bad;
+    Py_INCREF(*type);
+    Py_INCREF(*value);
+    Py_INCREF(*tb);
+    tmp_type = tstate->exc_type;
+    tmp_value = tstate->exc_value;
+    tmp_tb = tstate->exc_traceback;
+    tstate->exc_type = *type;
+    tstate->exc_value = *value;
+    tstate->exc_traceback = *tb;
+    /* Make sure tstate is in a consistent state when we XDECREF
+    these objects (XDECREF may run arbitrary code). */
+    Py_XDECREF(tmp_type);
+    Py_XDECREF(tmp_value);
+    Py_XDECREF(tmp_tb);
+    return 0;
+bad:
+    Py_XDECREF(*type);
+    Py_XDECREF(*value);
+    Py_XDECREF(*tb);
+    return -1;
+}
+
+
 static INLINE void __Pyx_RaiseNoneNotIterableError(void) {
     PyErr_SetString(PyExc_TypeError, "'NoneType' object is not iterable");
 }
@@ -13323,6 +24186,30 @@ static int __Pyx_ArgTypeTest(PyObject *obj, PyTypeObject *type, int none_allowed
     return 0;
 }
 
+static INLINE void __Pyx_ExceptionSave(PyObject **type, PyObject **value, PyObject **tb) {
+    PyThreadState *tstate = PyThreadState_GET();
+    *type = tstate->exc_type;
+    *value = tstate->exc_value;
+    *tb = tstate->exc_traceback;
+    Py_XINCREF(*type);
+    Py_XINCREF(*value);
+    Py_XINCREF(*tb);
+}
+
+static void __Pyx_ExceptionReset(PyObject *type, PyObject *value, PyObject *tb) {
+    PyObject *tmp_type, *tmp_value, *tmp_tb;
+    PyThreadState *tstate = PyThreadState_GET();
+    tmp_type = tstate->exc_type;
+    tmp_value = tstate->exc_value;
+    tmp_tb = tstate->exc_traceback;
+    tstate->exc_type = type;
+    tstate->exc_value = value;
+    tstate->exc_traceback = tb;
+    Py_XDECREF(tmp_type);
+    Py_XDECREF(tmp_value);
+    Py_XDECREF(tmp_tb);
+}
+
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list) {
     PyObject *__import__ = 0;
     PyObject *empty_list = 0;
@@ -13504,6 +24391,119 @@ static INLINE npy_intp __Pyx_PyInt_from_py_npy_intp(PyObject* x) {
   return (npy_intp)-1;
 }
 
+#if PY_MAJOR_VERSION < 3
+static PyObject *__Pyx_GetStdout(void) {
+    PyObject *f = PySys_GetObject((char *)"stdout");
+    if (!f) {
+        PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout");
+    }
+    return f;
+}
+
+static int __Pyx_Print(PyObject *arg_tuple, int newline) {
+    PyObject *f;
+    PyObject* v;
+    int i;
+
+    if (!(f = __Pyx_GetStdout()))
+        return -1;
+    for (i=0; i < PyTuple_GET_SIZE(arg_tuple); i++) {
+        if (PyFile_SoftSpace(f, 1)) {
+            if (PyFile_WriteString(" ", f) < 0)
+                return -1;
+        }
+        v = PyTuple_GET_ITEM(arg_tuple, i);
+        if (PyFile_WriteObject(v, f, Py_PRINT_RAW) < 0)
+            return -1;
+        if (PyString_Check(v)) {
+            char *s = PyString_AsString(v);
+            Py_ssize_t len = PyString_Size(v);
+            if (len > 0 &&
+                isspace(Py_CHARMASK(s[len-1])) &&
+                s[len-1] != ' ')
+                    PyFile_SoftSpace(f, 0);
+        }
+    }
+    if (newline) {
+        if (PyFile_WriteString("\n", f) < 0)
+            return -1;
+        PyFile_SoftSpace(f, 0);
+    }
+    return 0;
+}
+
+#else /* Python 3 has a print function */
+
+static int __Pyx_Print(PyObject *arg_tuple, int newline) {
+    PyObject* kwargs = 0;
+    PyObject* result = 0;
+    PyObject* end_string;
+    if (!__pyx_print) {
+        __pyx_print = __Pyx_GetAttrString(__pyx_b, "print");
+        if (!__pyx_print)
+            return -1;
+    }
+    if (!newline) {
+        if (!__pyx_print_kwargs) {
+            __pyx_print_kwargs = PyDict_New();
+            if (!__pyx_print_kwargs)
+                return -1;
+            end_string = PyUnicode_FromStringAndSize(" ", 1);
+            if (!end_string)
+                return -1;
+            if (PyDict_SetItemString(__pyx_print_kwargs, "end", end_string) < 0) {
+                Py_DECREF(end_string);
+                return -1;
+            }
+            Py_DECREF(end_string);
+        }
+        kwargs = __pyx_print_kwargs;
+    }
+    result = PyObject_Call(__pyx_print, arg_tuple, kwargs);
+    if (!result)
+        return -1;
+    Py_DECREF(result);
+    return 0;
+}
+
+#endif
+
+#if PY_MAJOR_VERSION < 3
+
+static int __Pyx_PrintOne(PyObject *o) {
+    PyObject *f;
+    if (!(f = __Pyx_GetStdout()))
+        return -1;
+    if (PyFile_SoftSpace(f, 0)) {
+        if (PyFile_WriteString(" ", f) < 0)
+            return -1;
+    }
+    if (PyFile_WriteObject(o, f, Py_PRINT_RAW) < 0)
+        return -1;
+    if (PyFile_WriteString("\n", f) < 0)
+        return -1;
+    return 0;
+    /* the line below is just to avoid compiler
+     * compiler warnings about unused functions */
+    return __Pyx_Print(NULL, 0);
+}
+
+#else /* Python 3 has a print function */
+
+static int __Pyx_PrintOne(PyObject *o) {
+    int res;
+    PyObject* arg_tuple = PyTuple_New(1);
+    if (unlikely(!arg_tuple))
+        return -1;
+    Py_INCREF(o);
+    PyTuple_SET_ITEM(arg_tuple, 0, o);
+    res = __Pyx_Print(arg_tuple, 1);
+    Py_DECREF(arg_tuple);
+    return res;
+}
+
+#endif
+
 static INLINE PyObject *__Pyx_PyInt_to_py_npy_intp(npy_intp val) {
   /**/ if (sizeof(npy_intp) <  sizeof(long))
       return PyInt_FromLong((long)val);
diff --git a/scikits/image/opencv/opencv_cv.pyx b/scikits/image/opencv/opencv_cv.pyx
index defb817c..f8fa5944 100644
--- a/scikits/image/opencv/opencv_cv.pyx
+++ b/scikits/image/opencv/opencv_cv.pyx
@@ -17,6 +17,91 @@ from _libimport import cv
 # setup numpy tables for this module
 np.import_array()
 
+#-------------------------------------------------------------------------------
+# Useful global stuff
+#-------------------------------------------------------------------------------
+
+# a dict for cvCvtColor to get the appropriate types and shapes without
+# if statements all over the place (this way is faster, cause the dict is
+# created at import time)
+# the order of list arguments is:
+# [in_channels, out_channels, [input_dtypes]]
+# out type is always the same as in type
+
+_cvtcolor_dict = {CV_BGR2BGRA: [3, 4, [UINT8, UINT16, FLOAT32]],
+                  CV_RGB2RGBA: [3, 4, [UINT8, UINT16, FLOAT32]],
+                  CV_BGRA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_RGBA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_BGR2RGBA: [3, 4, [UINT8, UINT16, FLOAT32]],
+                  CV_RGB2BGRA: [3, 4, [UINT8, UINT16, FLOAT32]],
+                  CV_RGBA2BGR: [4, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_BGRA2RGB: [4, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_BGR2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_RGB2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_BGRA2RGBA: [4, 4, [UINT8, UINT16, FLOAT32]],
+                  CV_RGBA2BGRA: [4, 4, [UINT8, UINT16, FLOAT32]],
+                  CV_BGR2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],
+                  CV_RGB2GRAY: [3, 1, [UINT8, UINT16, FLOAT32]],
+                  CV_GRAY2BGR: [1, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_GRAY2RGB: [1, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_GRAY2BGRA: [1, 4, [UINT8, UINT16, FLOAT32]],
+                  CV_GRAY2RGBA: [1, 4, [UINT8, UINT16, FLOAT32]],
+                  CV_BGRA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],
+                  CV_RGBA2GRAY: [4, 1, [UINT8, UINT16, FLOAT32]],
+                  CV_BGR2BGR565: [3, 2, [UINT8]],
+                  CV_RGB2BGR565: [3, 2, [UINT8]],
+                  CV_BGR5652BGR: [2, 3, [UINT8]],
+                  CV_BGR5652RGB: [2, 3, [UINT8]],
+                  CV_BGRA2BGR565: [4, 2, [UINT8]],
+                  CV_RGBA2BGR565: [4, 2, [UINT8]],
+                  CV_BGR5652BGRA: [2, 4, [UINT8]],
+                  CV_BGR5652RGBA: [2, 4, [UINT8]],
+                  CV_GRAY2BGR565: [1, 2, [UINT8]],
+                  CV_BGR5652GRAY: [2, 1, [UINT8]],
+                  CV_BGR2BGR555: [3, 2, [UINT8]],
+                  CV_RGB2BGR555: [3, 2, [UINT8]],
+                  CV_BGR5552BGR: [2, 3, [UINT8]],
+                  CV_BGR5552RGB: [2, 3, [UINT8]],
+                  CV_BGRA2BGR555: [4, 2, [UINT8]],
+                  CV_RGBA2BGR555: [4, 2, [UINT8]],
+                  CV_BGR5552BGRA: [2, 4, [UINT8]],
+                  CV_BGR5552RGBA: [2, 4, [UINT8]],
+                  CV_GRAY2BGR555: [1, 2, [UINT8]],
+                  CV_BGR5552GRAY: [2, 1, [UINT8]],
+                  CV_BGR2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_RGB2XYZ: [3, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_XYZ2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_XYZ2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_BGR2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_RGB2YCrCb: [3, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_YCrCb2BGR: [3, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_YCrCb2RGB: [3, 3, [UINT8, UINT16, FLOAT32]],
+                  CV_BGR2HSV: [3, 3, [UINT8, FLOAT32]],
+                  CV_RGB2HSV: [3, 3, [UINT8, FLOAT32]],
+                  CV_BGR2Lab: [3, 3, [UINT8, FLOAT32]],
+                  CV_RGB2Lab: [3, 3, [UINT8, FLOAT32]],
+                  CV_BayerBG2BGR: [1, 3, [UINT8]],
+                  CV_BayerGB2BGR: [1, 3, [UINT8]],
+                  CV_BayerRG2BGR: [1, 3, [UINT8]],
+                  CV_BayerGR2BGR: [1, 3, [UINT8]],
+                  CV_BayerBG2RGB: [1, 3, [UINT8]],
+                  CV_BayerGB2RGB: [1, 3, [UINT8]],
+                  CV_BayerRG2RGB: [1, 3, [UINT8]],
+                  CV_BayerGR2RGB: [1, 3, [UINT8]],
+                  CV_BGR2Luv: [3, 3, [UINT8, FLOAT32]],
+                  CV_RGB2Luv: [3, 3, [UINT8, FLOAT32]],
+                  CV_BGR2HLS: [3, 3, [UINT8, FLOAT32]],
+                  CV_RGB2HLS: [3, 3, [UINT8, FLOAT32]],
+                  CV_HSV2BGR: [3, 3, [UINT8, FLOAT32]],
+                  CV_HSV2RGB: [3, 3, [UINT8, FLOAT32]],
+                  CV_Lab2BGR: [3, 3, [UINT8, FLOAT32]],
+                  CV_Lab2RGB: [3, 3, [UINT8, FLOAT32]],
+                  CV_Luv2BGR: [3, 3, [UINT8, FLOAT32]],
+                  CV_Luv2RGB: [3, 3, [UINT8, FLOAT32]],
+                  CV_HLS2BGR: [3, 3, [UINT8, FLOAT32]],
+                  CV_HLS2RGB: [3, 3, [UINT8, FLOAT32]]}
+
+
 ###################################
 # opencv function declarations
 ###################################
@@ -143,6 +228,11 @@ ctypedef void (*cvIntegralPtr)(IplImage*, IplImage*, IplImage*, IplImage*)
 cdef cvIntegralPtr c_cvIntegral
 c_cvIntegral = (<cvIntegralPtr*><size_t>ctypes.addressof(cv.cvIntegral))[0]
 
+# cvCvtColor
+ctypedef void (*cvCvtColorPtr)(IplImage*, IplImage*, int)
+cdef cvCvtColorPtr c_cvCvtColor
+c_cvCvtColor = (<cvCvtColorPtr*><size_t>ctypes.addressof(cv.cvCvtColor))[0]
+
 # cvCalibrateCamera2
 ctypedef void (*cvCalibrateCamera2Ptr)(CvMat*, CvMat*, CvMat*,
        CvSize, CvMat*, CvMat*, CvMat*, CvMat*, int)
@@ -1029,6 +1119,50 @@ def cvIntegral(np.ndarray src, square_sum=False, tilted_sum=False):
 
     return out
 
+def cvCvtColor(np.ndarray src, int code):
+
+    validate_array(src)
+    assert_dtype(src, [UINT8, UINT16, FLOAT32])
+
+    try:
+        conversion_params = _cvtcolor_dict[code]
+    except KeyError:
+        print 'unknown conversion code'
+        raise
+
+    cdef int src_channels = <int>conversion_params[0]
+    cdef int out_channels = <int>conversion_params[1]
+    src_dtypes = conversion_params[2]
+
+    assert_nchannels(src, src_channels)
+    assert_dtype(src, src_dtypes)
+
+    cdef np.ndarray out
+
+    # the out array can be 2, 3, or 4 channels so we need shapes that
+    # can handle either
+    cdef np.npy_intp out_shape2[2]
+    cdef np.npy_intp out_shape3[3]
+    out_shape2[0] = src.shape[0]
+    out_shape2[1] = src.shape[1]
+    out_shape3[0] = src.shape[0]
+    out_shape3[1] = src.shape[1]
+
+    if out_channels == 1:
+        out = new_array(2, out_shape2, src.dtype)
+    else:
+        out_shape3[2] = <np.npy_intp>out_channels
+        out = new_array(3, out_shape3, src.dtype)
+
+    cdef IplImage srcimg
+    cdef IplImage outimg
+    populate_iplimage(src, &srcimg)
+    populate_iplimage(out, &outimg)
+
+    c_cvCvtColor(&srcimg, &outimg, code)
+
+    return out
+
 def cvCalibrateCamera2(np.ndarray object_points, np.ndarray image_points,
            np.ndarray point_counts, image_size):
 
diff --git a/scikits/image/opencv/tests/test_opencv_cv.py b/scikits/image/opencv/tests/test_opencv_cv.py
index b6a2a068..2f41b5a0 100644
--- a/scikits/image/opencv/tests/test_opencv_cv.py
+++ b/scikits/image/opencv/tests/test_opencv_cv.py
@@ -186,6 +186,20 @@ class TestIntegral(OpenCVTest):
         cvIntegral(self.lena_RGB_U8, True, True)
 
 
+class TestCvtColor(OpenCVTest):
+    @opencv_skip
+    def test_cvCvtColor(self):
+        cvCvtColor(self.lena_RGB_U8, CV_RGB2BGR)
+        cvCvtColor(self.lena_RGB_U8, CV_RGB2BGRA)
+        cvCvtColor(self.lena_RGB_U8, CV_RGB2HSV)
+        cvCvtColor(self.lena_RGB_U8, CV_RGB2BGR565)
+        cvCvtColor(self.lena_RGB_U8, CV_RGB2BGR555)
+        cvCvtColor(self.lena_RGB_U8, CV_RGB2GRAY)
+        cvCvtColor(self.lena_GRAY_U8, CV_GRAY2BGR)
+        cvCvtColor(self.lena_GRAY_U8, CV_GRAY2BGR565)
+        cvCvtColor(self.lena_GRAY_U8, CV_GRAY2BGR555)
+
+
 class TestFindChessboardCorners(object):
     @opencv_skip
     def test_cvFindChessboardCorners(self):