mjg / rpms / opencv

Forked from rpms/opencv 3 years ago
Clone
4071339
diff -up OpenCV-2.4.4/modules/contrib/doc/facerec/src/crop_face.py.pillow OpenCV-2.4.4/modules/contrib/doc/facerec/src/crop_face.py
4071339
--- OpenCV-2.4.4/modules/contrib/doc/facerec/src/crop_face.py.pillow	2013-01-28 00:00:47.000000000 +0100
4071339
+++ OpenCV-2.4.4/modules/contrib/doc/facerec/src/crop_face.py	2013-02-18 19:56:11.979405809 +0100
83807c8
@@ -31,7 +31,8 @@
83807c8
 # ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
83807c8
 # POSSIBILITY OF SUCH DAMAGE.
83807c8
 
83807c8
-import sys, math, Image
83807c8
+import sys, math
83807c8
+from PIL import Image
83807c8
 
83807c8
 def Distance(p1,p2):
83807c8
   dx = p2[0] - p1[0]
4071339
diff -up OpenCV-2.4.4/modules/python/test/ticket_6.py.pillow OpenCV-2.4.4/modules/python/test/ticket_6.py
4071339
--- OpenCV-2.4.4/modules/python/test/ticket_6.py.pillow	2013-01-28 00:00:48.000000000 +0100
4071339
+++ OpenCV-2.4.4/modules/python/test/ticket_6.py	2013-02-18 19:58:14.288877399 +0100
4071339
@@ -2,7 +2,7 @@
4071339
 
83807c8
 import urllib
83807c8
 import cv2.cv as cv
83807c8
-import Image
83807c8
+from PIL import Image
83807c8
 import unittest
83807c8
 
83807c8
 class TestLoadImage(unittest.TestCase):