makelove · ramwin · Apr 18, 2016 · Apr 18, 2016 · Apr 18, 2016 · Apr 18, 2016
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/.idea/
+*.pyc
+*~
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/OpenCV-Python-Toturial.iml b/.idea/OpenCV-Python-Toturial.iml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/README.md b/README.md
@@ -1,4 +1,8 @@
 # OpenCV-Python-Toturial
 
 ##http://www.opencv.org.cn/forum.php?mod=viewthread&tid=32525
-这个repo是这本书的所有源代码。opencv2.4+python 3.0
+这个repo是这本书的所有源代码。opencv2.4+python 2.0
+
+# 安装:  
+## ubuntu14.04:
+sudo apt-get install python-opencv
diff --git a/README.md~ b/README.md~
diff --git a/ch4/4.1_imread_imshow.py → ch04/4.1_imread_imshow.py b/ch4/4.1_imread_imshow.py → ch04/4.1_imread_imshow.py
diff --git a/ch4/4.imread_imshow_imwrite.py → ch04/4.2imread_imshow_imwrite.py b/ch4/4.imread_imshow_imwrite.py → ch04/4.2imread_imshow_imwrite.py
@@ -6,6 +6,6 @@
 k = cv2.waitKey(0)
 if k == 27:         # wait for ESC key to exit
     cv2.destroyAllWindows()
-elif k == ord('s'): # wait for 's' key to save and exit
+elif k == ord('s')&0xFF: # wait for 's' key to save and exit
     cv2.imwrite('messigray.png',img)
-    cv2.destroyAllWindows()
+    cv2.destroyAllWindows()
diff --git a/ch4/4.matplotlib.py → ch04/4.matplotlib.py b/ch4/4.matplotlib.py → ch04/4.matplotlib.py
diff --git a/ch4/messi5.jpg → ch04/messi5.jpg b/ch4/messi5.jpg → ch04/messi5.jpg
diff --git a/ch4/messigray.png → ch04/messigray.png b/ch4/messigray.png → ch04/messigray.png
diff --git a/ch5/5.VideoCapture.py → ch05/5.VideoCapture.py b/ch5/5.VideoCapture.py → ch05/5.VideoCapture.py
diff --git a/ch5/5.VideoPlay.py → ch05/5.VideoPlay.py b/ch5/5.VideoPlay.py → ch05/5.VideoPlay.py
diff --git a/ch5/5.VideoWriter.py → ch05/5.VideoWriter.py b/ch5/5.VideoWriter.py → ch05/5.VideoWriter.py
diff --git a/ch5/__init__.py → ch05/__init__.py b/ch5/__init__.py → ch05/__init__.py
diff --git a/ch6/6.draw.py → ch06/6.draw.py b/ch6/6.draw.py → ch06/6.draw.py
diff --git a/ch7/7.MouseCallback.py → ch07/7.MouseCallback.py b/ch7/7.MouseCallback.py → ch07/7.MouseCallback.py
diff --git a/ch7/7.draw_circle_rectangle.py → ch07/7.draw_circle_rectangle.py b/ch7/7.draw_circle_rectangle.py → ch07/7.draw_circle_rectangle.py
diff --git a/ch8/8.Trackbar_draw.py → ch08/8.Trackbar_draw.py b/ch8/8.Trackbar_draw.py → ch08/8.Trackbar_draw.py
diff --git a/ch8/8.createTrackbar.py → ch08/8.createTrackbar.py b/ch8/8.createTrackbar.py → ch08/8.createTrackbar.py
diff --git a/ch9/9.MakeBorder.py → ch09/9.MakeBorder.py b/ch9/9.MakeBorder.py → ch09/9.MakeBorder.py
diff --git a/ch9/9.img_roi.py → ch09/9.img_roi.py b/ch9/9.img_roi.py → ch09/9.img_roi.py
diff --git a/ch9/9.itemset.py → ch09/9.itemset.py b/ch9/9.itemset.py → ch09/9.itemset.py
diff --git a/ch9/9.shape.py → ch09/9.shape.py b/ch9/9.shape.py → ch09/9.shape.py
diff --git a/ch9/9.split_color.py → ch09/9.split_color.py b/ch9/9.split_color.py → ch09/9.split_color.py
diff --git a/ch51-对xiang检测/51.CascadeClassifier.py~ b/ch51-对xiang检测/51.CascadeClassifier.py~
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    /.idea/
+    *.pyc
+    *~