pygame / lib / _camera_opencv_highgui.py

Diff from to

lib/_camera_opencv_highgui.py

 
 import opencv
 #this is important for capturing/displaying images
-from opencv import highgui 
+from opencv import highgui
 
 
 
 
 class Camera:
 
-    def __init__(self, device =0, size = (640,480), mode = "RGB"):
+    def __init__(self, device = 0, size = (640,480), mode = "RGB"):
         """
         """
         self.camera = highgui.cvCreateCameraCapture(device)
         #convert Ipl image to PIL image
         #print type(im)
         if im:
-            xx = opencv.adaptors.Ipl2NumPy(im) 
+            xx = opencv.adaptors.Ipl2NumPy(im)
             #print type(xx)
             #print xx.iscontiguous()
             #print dir(xx)
             #print xx.shape
             xxx = numpy.reshape(xx, (numpy.product(xx.shape),))
-      
+
             if xx.shape[2] != 3:
                 raise ValueError("not sure what to do about this size")
 
             # if there is a destination surface given, we blit onto that.
             if dest_surf:
                 dest_surf.blit(pg_img, (0,0))
-            return pg_img
-            #return xxx
-            #return opencv.adaptors.Ipl2PIL(im) 
+            return dest_surf
+            #return pg_img
+
 
 
 if __name__ == "__main__":
     pygame.camera.list_cameras = list_cameras
     pygame.examples.camera.main()
 
-    
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.