Changeset 667 for trunk/software

Timestamp:

02/11/10 02:14:30 (2 years ago)

Author:

mosttw

Message:

Fix for refcounting bug causing nasty memory leak

Location:

trunk/software

Files:

• rb/vision/_camera.c (modified) (2 diffs)
• rb/vision/gstcam.py (modified) (2 diffs)
• rb/vision/makefile (modified) (1 diff)
• scripts (modified) (1 prop)
• scripts/calib (modified) (1 prop)

trunk/software/rb/vision/_camera.c

@@ -17 +17 @@
 
 #include <Python.h>
+#include <glib.h>
 #include <pygobject.h>
 #include <pygtk/pygtk.h>
@@ -90 +91 @@
                 if (pixbuf != NULL) {
                         PyObject *py_pixbuf = pygobject_new((GObject*) pixbuf);
+                        g_object_unref(G_OBJECT(pixbuf));
                         return py_pixbuf;
                 } else {

trunk/software/rb/vision/gstcam.py

@@ -16 +16 @@
 import time
 import logging
+import gobject
 from rb.vision._camera import ipl_image_from_rgb_buffer, save_image
 
 import gst
-
 
 
@@ -48 +48 @@
                 
                 self.pipeline.set_state(gst.STATE_PLAYING)
+
+                if self.controller is not None:
+                        gobject.timeout_add(100, self._send_image)
         
+        def _send_image(self):
+                image = self.get_last_image()
+                if image is not None:
+                        self.controller.send('camera_image', (self.source, image))
+                return True # Call me again
+
         def get_last_image(self):
                 buffer = self.appsink.get_last_buffer()

trunk/software/rb/vision/makefile

@@ -1 @@
-CFLAGS   = -p -pg -g -Wall -Werror -Wno-unused -pedantic -fPIC --std=gnu99 -fgnu89-inline -O3 $(shell pkg-config --cflags opencv gsl)
+CFLAGS   = -p -pg -g -Wall -Werror -Wno-unused -pedantic -fPIC --std=gnu99 -fgnu89-inline -O3 $(shell pkg-config --cflags opencv gsl glib-2.0 gobject-2.0)
 #CFLAGS   = -p -pg -g -Wall -Werror -pedantic -fPIC -O3 $(shell pkg-config --cflags opencv gsl)
 CPPFLAGS = -p -pg -g -Wall -Werror -Wno-unused -pedantic -fPIC -O3 $(shell pkg-config --cflags opencv gsl)