Commits

Anonymous committed 0d93c45

Merged back changes from trunk.

Comments (0)

Files changed (12)

-include Setup.in Setup_Darwin.in Setup_Win_Common.in *.py WHATSNEW readme.txt install.html LGPL
+include Setup.in Setup_Darwin.in Setup_Win_Common.in *.py WHATSNEW readme.txt install.html readme.html LGPL
 
 recursive-include docs *
 recursive-include lib *
 # BREAK = change breaks existing code
 # BUG    = fixed a bug that was (or could have been) crashing
 
+[SVN 2573] August 6, 2009
+    [BUG] missing readme.html in MANIFEST.in causes install to fail
+        on pythons with setuptools installed.
+
 [SVN 2519] July 17, 2009
     [BUG] fix pygame.font.get_fonts() bug for Python 3.1 and Windows.
 

lib/_camera_opencv_highgui.py

 
 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)
 
     elif "linux" in sys.platform:
         use__camera = True
-
+    elif "darwin" in sys.platform:
+        use__camera = True
     else:
         use_opencv = True
 
 releases. (hmm, until we get to versions > 10)
 """
 
-ver =   '1.9.0release'
-vernum = 1,9,0
+ver =   '1.9.2pre'
+vernum = 1,9,2
 <font size=+5><b>Pygame Readme</b></font>
 </td></tr><tr><td align=left width=33%><big>
 
-Version 1.9.0release
+Version 1.9.2pre
 
 
 </td><td align=center width=34%><big>
 
    Pygame Readme
-   Version 1.9.0release Python Game Development
+   Version 1.9.2pre Python Game Development
    Originally by Pete Shinners, now an open source community project.
    http://www.pygame.org
    pygame@seul.org
 
 METADATA = {
     "name":             "pygame",
-    "version":          "1.9.0release",
+    "version":          "1.9.2pre",
     "license":          "LGPL",
     "url":              "http://www.pygame.org",
     "author":           "Pete Shinners, Rene Dudfield, Marcus von Appen, Bob Pendleton, others...",
     free(devices);
     
     return ret_list;
+#elif defined(__APPLE__)
+    /* Hier komt apple gedoe... */
+    Py_RETURN_NONE;
 #else
 	Py_RETURN_NONE;
 #endif
 
     #include <linux/videodev.h>
     #include <linux/videodev2.h>
+#elif define(__APPLE__)
+
 #endif
 
 #define CLEAR(x) memset (&(x), 0, sizeof (x))
 int v4l_open_device (PyCameraObject* self);
 int v4l_init_device(PyCameraObject* self);
 int v4l_start_capturing(PyCameraObject* self);
+#elif define(__APPLE__)
+char** mac_list_cameras(int* num_devices);
+int mac_open_device (PyCameraObject* self);
+int mac_init_device(PyCameraObject* self);
+int mac_close_device (PyCameraObject* self);
+
+int mac_start_capturing(PyCameraObject* self);
+int mac_stop_capturing (PyCameraObject* self);
 #endif

test/camera_test.py

+#################################### IMPORTS ###################################
+
+from __future__ import generators
+
+if __name__ == '__main__':
+    import sys
+    import os
+    pkg_dir = os.path.split(os.path.abspath(__file__))[0]
+    parent_dir, pkg_name = os.path.split(pkg_dir)
+    is_pygame_pkg = (pkg_name == 'tests' and
+                      os.path.split(parent_dir)[1] == 'pygame')
+    if not is_pygame_pkg:
+        sys.path.insert(0, parent_dir)
+else:
+    is_pygame_pkg = __name__.startswith('pygame.tests.')
+
+if is_pygame_pkg:
+    from pygame.tests.test_utils import test_not_implemented, unittest
+else:
+    from test.test_utils import test_not_implemented, unittest
+import pygame
+from pygame.compat import long_
+import math
+
+#################################### Tests #####################################
+
+class CameraModuleTest(unittest.TestCase):
+    pass
+

Empty file added.

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.