Changeset 665 for trunk/software/rb/vision/_camera.c

Timestamp:

02/11/10 01:33:02 (2 years ago)

Author:

mosttw

Message:

Fixed issues with GStreamer camera driver

Files:

• trunk/software/rb/vision/_camera.c (modified) (3 diffs)

trunk/software/rb/vision/_camera.c

@@ -1 +1 @@
 // rb.vision._camera -- Python interface to OpenCV camera functions
-// Copyright (C) 2009 Andy Spencer, Tom Most
+// Copyright (C) 2009 Andy Spencer
+// Copyright (C) 2009-2010 Thomas W. Most
 // 
 // This program is free software: you can redistribute it and/or modify
@@ -147 +148 @@
 
 
-
 ////// Camera OBJECT //////
 
@@ -230 +230 @@
         {"get_frame", (PyCFunction) Camera_get_frame, METH_NOARGS,
                 "Capture a frame from the camera.  Returns an `IplImage`."},
-        {NULL}  /* Sentinel */
+        {NULL}  // Sentinel
 };
 
 static PyTypeObject CameraType = {
         PyObject_HEAD_INIT(NULL)
-        0,                                        /*ob_size*/
-    "rb.vision._camera.Camera",               /*tp_name*/
-    sizeof(Camera),                           /*tp_basicsize*/
-    0,                                        /*tp_itemsize*/
-    (destructor) Camera_dealloc,              /*tp_dealloc*/
-    0,                                        /*tp_print*/
-    0,                                        /*tp_getattr*/
-    0,                                        /*tp_setattr*/
-    0,                                        /*tp_compare*/
-    0,                                        /*tp_repr*/
-    0,                                        /*tp_as_number*/
-    0,                                        /*tp_as_sequence*/
-    0,                                        /*tp_as_mapping*/
-    0,                                        /*tp_hash */
-    0,                                        /*tp_call*/
-    0,                                        /*tp_str*/
-    0,                                        /*tp_getattro*/
-    0,                                        /*tp_setattro*/
-    0,                                        /*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /*tp_flags*/
+        0,                                        // ob_size
+    "rb.vision._camera.Camera",               // tp_name
+    sizeof(Camera),                           // tp_basicsize
+    0,                                        // tp_itemsize
+    (destructor) Camera_dealloc,              // tp_dealloc
+    0,                                        // tp_print
+    0,                                        // tp_getattr
+    0,                                        // tp_setattr
+    0,                                        // tp_compare
+    0,                                        // tp_repr
+    0,                                        // tp_as_number
+    0,                                        // tp_as_sequence
+    0,                                        // tp_as_mapping
+    0,                                        // tp_hash 
+    0,                                        // tp_call
+    0,                                        // tp_str
+    0,                                        // tp_getattro
+    0,                                        // tp_setattro
+    0,                                        // tp_as_buffer
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, // tp_flags
     "Fetches images using OpenCV's camera capture functions.  "
     "The sole optional argument, `index`, is an integer indicating "
     "the camera to open (-1, the default, just opens some camera). "
-    "Throws `RuntimeError` if unable to open a camera.", /* tp_doc */
-    0,                                            /* tp_traverse */
-    0,                                            /* tp_clear */
-    0,                                            /* tp_richcompare */
-    0,                                            /* tp_weaklistoffset */
-    0,                                            /* tp_iter */
-    0,                                            /* tp_iternext */
-    Camera_methods,                           /* tp_methods */
-    0,                                        /* tp_members */
-    0,                                        /* tp_getset */
-    0,                                        /* tp_base */
-    0,                                        /* tp_dict */
-    0,                                        /* tp_descr_get */
-    0,                                        /* tp_descr_set */
-    0,                                        /* tp_dictoffset */
-    (initproc) Camera_init,                   /* tp_init */
-    0,                                        /* tp_alloc */
-    Camera_new,                               /* tp_new */
+    "Throws `RuntimeError` if unable to open a camera.", // tp_doc
+    0,                                            // tp_traverse
+    0,                                            // tp_clear
+    0,                                            // tp_richcompare
+    0,                                            // tp_weaklistoffset
+    0,                                            // tp_iter
+    0,                                            // tp_iternext
+    Camera_methods,                           // tp_methods
+    0,                                        // tp_members
+    0,                                        // tp_getset
+    0,                                        // tp_base
+    0,                                        // tp_dict
+    0,                                        // tp_descr_get
+    0,                                        // tp_descr_set
+    0,                                        // tp_dictoffset
+    (initproc) Camera_init,                   // tp_init
+    0,                                        // tp_alloc
+    Camera_new,                               // tp_new
 };