sccolbert e3aa75df33 Merge branch 'cvtcolor' ...

Conflicts:
	scikits/image/opencv/opencv_backend.c
	scikits/image/opencv/opencv_cv.c

2009-10-24 15:10:44 +02:00

..

color

Add note on assumed data range.

2009-10-23 15:06:27 +02:00

data

added camera calibration from Holger Rapp and fixed a bug in CvMat struct

2009-10-23 15:06:35 +02:00

filter

Change "Additional Parameters" to "Other Parameters".

2009-10-13 13:49:38 +02:00

io

Bug fix for imread so images that are already grey-scale do not get flattened.

2009-10-21 16:39:48 +02:00

opencv

Merge branch 'cvtcolor'

2009-10-24 15:10:44 +02:00

transform

Fix markup in docs.

2009-10-04 02:02:51 +02:00

__init__.py

Add package __version__.

2009-10-24 11:48:58 +02:00

setup.py

Add setup.py in scikits/image.

2009-10-15 09:26:22 +02:00