Merge branch '2.4'

This commit is contained in:
Andrey Kamaev
2013-04-12 15:35:38 +04:00
75 changed files with 1259 additions and 3979 deletions

View File

@@ -1,3 +1,5 @@
#!/usr/bin/env python
'''
This module contains some common routines used by other samples.
'''

View File

@@ -1,4 +1,4 @@
#/usr/bin/env python
#!/usr/bin/env python
import cv2
import numpy as np

View File

@@ -1,4 +1,4 @@
#/usr/bin/env python
#!/usr/bin/env python
'''
Watershed segmentation