Update of /cvsroot/freevo/freevo/lib/pyimlib2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3322

Modified Files:
        Imlib2.py image.c 
Log Message:
make it possible to get raw image data as pointer and not as buffer

Index: image.c
===================================================================
RCS file: /cvsroot/freevo/freevo/lib/pyimlib2/image.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** image.c     22 Jan 2005 13:13:49 -0000      1.13
--- image.c     16 Mar 2005 14:54:05 -0000      1.14
***************
*** 537,540 ****
--- 537,548 ----
      else if (!strcmp(name, "filename"))
          return Py_BuildValue("s", imlib_image_get_filename());
+     else if (!strcmp(name, "raw_data_addr")) {
+         if (self->raw_data)
+           return Py_BuildValue("l", self->raw_data);
+       else
+           return Py_BuildValue("l", imlib_image_get_data_for_reading_only());
+     }
+     else if (!strcmp(name, "raw_data_size"))
+         return Py_BuildValue("l", self->raw_data_size);
  
      return Py_FindMethod(Image_PyObject_methods, (PyObject *)self, name);

Index: Imlib2.py
===================================================================
RCS file: /cvsroot/freevo/freevo/lib/pyimlib2/Imlib2.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Imlib2.py   22 Jan 2005 18:18:15 -0000      1.18
--- Imlib2.py   16 Mar 2005 14:54:05 -0000      1.19
***************
*** 112,118 ****
  
  
!     def get_raw_data(self, format = "BGRA"):
          """
!         Returns raw image data as buffer for read only access.
          Please free the raw data later and do not delete the object while
          the data is still needed.
--- 112,119 ----
  
  
!     def get_raw_data(self, format = "BGRA", type = "buffer" ):
          """
!         Returns raw image data for read only access.
!         
          Please free the raw data later and do not delete the object while
          the data is still needed.
***************
*** 126,131 ****
                made it up.)
  
!         Returns: A buffer object containing the raw image data.
          """
          return self._image.get_raw_data(format)
  
--- 127,138 ----
                made it up.)
  
!         Returns: If type is 'buffer', return a buffer object containing the 
raw
!                  image data. If type is 'raw', return the pointer and len of 
the
!                  raw image data.
          """
+         if type == 'raw':
+             # create raw data
+             self._image.get_raw_data(format)
+             return self._image.raw_data_addr, self._image.raw_data_size
          return self._image.get_raw_data(format)
  



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog

Reply via email to