removed return images and fixed cv2 names
undo changes of cv2.cv.* functions/constants
Merge pull request #2319 from m3d:patch-1