Implemented the buffer protocol in sf.Image

The Pixels was therefore removed. Use memoryview(image) or simply image.pixels to access the underlying byte array.
Other method implementations were adjusted.

Author: intjelic

include/Includes/pysfml/window.pxd

@@ -16,11 +16,6 @@ cdef extern from "pysfml/window/window.h":
     cdef class sfml.window.ContextSettings [object PyContextSettingsObject]:
         cdef sf.ContextSettings *p_this
 
-    cdef class sfml.window.Pixels [object PyPixelsObject]:
-        cdef Uint8          *p_array
-        cdef unsigned int    m_width
-        cdef unsigned int    m_height
-
     cdef class sfml.window.Event [object PyEventObject]:
         cdef sf.Event *p_this
 

include/Includes/sfml/sfml.pxd

@@ -292,10 +292,6 @@ cdef extern from "SFML/Window.hpp" namespace "sf":
 
 cimport blendmode, primitivetype, texture, shader, font, text, renderstates, transform
 
-cdef extern from *:
-    ctypedef unsigned char* const_Uint8_ptr "const unsigned char*"
-
-
 cdef extern from "SFML/Graphics.hpp" namespace "sf":
     cdef cppclass Rect[T]:
         Rect()
@@ -375,7 +371,7 @@ cdef extern from "SFML/Graphics.hpp" namespace "sf":
     cdef cppclass Image:
         Image()
         void create(unsigned int, unsigned int)
-        void create(unsigned int, unsigned int, const const_Uint8_ptr)
+        void create(unsigned int, unsigned int, const Uint8*)
         void create(unsigned int, unsigned int, const Color)
         bint loadFromFile(char*&)
         bint loadFromMemory(const void*, size_t)

src/sfml/graphics/DerivableDrawable.cpp

@@ -12,6 +12,12 @@
 #include <pysfml/graphics/NumericObject.hpp>
 #include <pysfml/graphics/graphics_api.h>
 
+const sf::Uint8* getPixelsPtr(PyObject* memoryview)
+{
+    Py_buffer* buffer = PyMemoryView_GET_BUFFER(memoryview);
+    return static_cast<const sf::Uint8*>(buffer->buf);
+}
+
 DerivableDrawable::DerivableDrawable(PyObject* object) :
 m_object(object)
 {

src/sfml/graphics/DerivableDrawable.hpp

@@ -13,6 +13,9 @@
 #include "Python.h"
 #include <SFML/Graphics/Drawable.hpp>
 
+
+const sf::Uint8* getPixelsPtr(PyObject* memoryview);
+
 class DerivableDrawable : public sf::Drawable
 {
 public:

src/sfml/graphics/graphics.pyx

@@ -15,13 +15,12 @@ cdef extern from "pysfml/graphics/DerivableDrawable.hpp":
     cdef cppclass DerivableDrawable:
         DerivableDrawable(object)
 
+    const Uint8* getPixelsPtr(object)
+
 cdef extern from "pysfml/graphics/DerivableRenderWindow.hpp":
     cdef cppclass DerivableRenderWindow:
         DerivableRenderWindow(object)
 
-cdef extern from *:
-    ctypedef void* PyUnicodeObject
-
 from libc.stdlib cimport malloc, free
 
 __all__ = ['BlendMode', 'PrimitiveType', 'Color', 'Rect', 'Transform',
@@ -45,8 +44,7 @@ from pysfml.system cimport Vector2, Vector3
 from pysfml.system cimport to_vector2i, to_vector2f
 from pysfml.system cimport to_string, wrap_string
 from pysfml.system cimport popLastErrorMessage, import_sfml__system
-from pysfml.window cimport VideoMode, ContextSettings, Pixels, Window
-from pysfml.window cimport wrap_pixels
+from pysfml.window cimport VideoMode, ContextSettings, Window
 
 import_sfml__system()
 
@@ -484,6 +482,22 @@ cdef public class Image[type PyImageType, object PyImageObject]:
         p[0] = self.p_this[0]
         return wrap_image(p)
 
+    def __getbuffer__(self, Py_buffer *buffer, int flags):
+        buffer.buf = <char*>self.p_this.getPixelsPtr()
+        buffer.format = 'c'
+        buffer.internal = NULL
+        buffer.itemsize = 1
+        buffer.len = self.p_this.getSize().x * self.p_this.getSize().y * 4
+        buffer.ndim = 1
+        buffer.obj = self
+        buffer.readonly = 1
+        buffer.shape = NULL
+        buffer.strides = NULL
+        buffer.suboffsets = NULL
+
+    def __releasebuffer__(self, Py_buffer *buffer):
+        pass
+
     @classmethod
     def create(cls, unsigned int width, unsigned int height, Color color=None):
         cdef sf.Image *p = new sf.Image()
@@ -507,15 +521,12 @@ cdef public class Image[type PyImageType, object PyImageObject]:
         return wrap_image(p)
 
     @classmethod
-    def from_pixels(cls, Pixels pixels):
-        cdef sf.Image *p
-
-        if pixels.p_array != NULL:
-            p = new sf.Image()
-            p.create(pixels.m_width, pixels.m_height, pixels.p_array)
-            return wrap_image(p)
+    def from_pixels(cls, int width, int height, pixels):
+        cdef sf.Image *p = new sf.Image()
+        cdef const sf.Uint8* pixels_ptr = getPixelsPtr(memoryview(pixels))
 
-        raise ValueError("Failed to create texture, invalid array (NULL)")
+        p.create(width, height, pixels_ptr)
+        return wrap_image(p)
 
     @classmethod
     def from_file(cls, filename):
@@ -575,8 +586,7 @@ cdef public class Image[type PyImageType, object PyImageObject]:
 
     property pixels:
         def __get__(self):
-            if self.p_this.getPixelsPtr():
-                return wrap_pixels(<Uint8*>self.p_this.getPixelsPtr(), self.width, self.height)
+            return memoryview(self)
 
     def flip_horizontally(self):
         self.p_this.flipHorizontally()
@@ -722,16 +732,7 @@ cdef public class Texture[type PyTextureType, object PyTextureObject]:
         if len(args) > 2:
             raise UserWarning("Too much arguments provided. It requires at most two.")
 
-        if type(args[0]) is Pixels:
-            if len(args) == 2:
-                if type(args[1]) in [Vector2, tuple]:
-                    self.update_from_pixels(args[0], args[1])
-                else:
-                    raise UserWarning("The second argument must be either a sf.Vector2 or a tuple")
-            else:
-                self.update_from_pixels(args[0])
-
-        elif type(args[0]) is Image:
+        if type(args[0]) is Image:
             if len(args) == 2:
                 if type(args[1]) in [Vector2, tuple]:
                     self.update_from_image(args[0], args[1])
@@ -752,13 +753,14 @@ cdef public class Texture[type PyTextureType, object PyTextureObject]:
         else:
             raise UserWarning("The first argument must be either sf.Pixels, sf.Image or sf.Window")
 
+    def update_from_pixels(self, pixels, *args):
+        cdef const sf.Uint8* pixels_ptr = getPixelsPtr(memoryview(pixels))
 
-    def update_from_pixels(self, Pixels pixels, position=None):
-        if not position:
-            self.p_this.update(pixels.p_array)
+        if not args:
+            self.p_this.update(pixels_ptr)
         else:
-            x, y = position
-            self.p_this.update(pixels.p_array, pixels.m_width, pixels.m_height, <unsigned int>x, <unsigned int>y)
+            width, height, x, y = args
+            self.p_this.update(pixels_ptr, width, height, x, y)
 
     def update_from_image(self, Image image, position=None):
         if not position:

src/sfml/window/window.pyx

@@ -33,9 +33,8 @@ __all__ = ['Style', 'VideoMode', 'ContextSettings', 'Event', 'EventType',
             'CloseEvent', 'ResizeEvent', 'FocusEvent', 'TextEvent',
             'KeyEvent', 'MouseWheelEvent', 'MouseButtonEvent',
             'MouseMoveEvent', 'MouseEvent', 'JoystickButtonEvent',
-            'JoystickMoveEvent', 'JoystickConnectEvent', 'Pixels',
-            'Window', 'Keyboard', 'Joystick', 'Mouse', 'Touch',
-            'Sensor', 'Context']
+            'JoystickMoveEvent', 'JoystickConnectEvent', 'Window',
+            'Keyboard', 'Joystick', 'Mouse', 'Touch', 'Sensor', 'Context']
 
 if PY_VERSION_HEX >= 0x03000000:
     unichr = chr
@@ -720,38 +719,6 @@ cdef ContextSettings wrap_contextsettings(sf.ContextSettings *v):
     return r
 
 
-cdef public class Pixels[type PyPixelsType, object PyPixelsObject]:
-    cdef Uint8*          p_array
-    cdef unsigned int    m_width
-    cdef unsigned int    m_height
-
-    def __init__(self):
-        raise UserWarning("This class is not meant to be used directly")
-
-    def __repr__(self):
-        return "Pixels(width={0}, height={1})".format(self.width, self.height)
-
-    def __getitem__(self, unsigned int index):
-        return self.p_this[index]
-
-    property width:
-        def __get__(self):
-            return self.m_width
-
-    property height:
-        def __get__(self):
-            return self.m_height
-
-    property data:
-        def __get__(self):
-            return (<char*>self.p_array)[:self.width*self.height*4]
-
-cdef api Pixels wrap_pixels(Uint8 *p, unsigned int w, unsigned int h):
-    cdef Pixels r = Pixels.__new__(Pixels)
-    r.p_array, r.m_width, r.m_height = p, w, h
-    return r
-
-
 cdef public class Window[type PyWindowType, object PyWindowObject]:
     cdef sf.Window *p_window
 
@@ -830,9 +797,8 @@ cdef public class Window[type PyWindowType, object PyWindowObject]:
         def __set__(self, title):
             self.p_window.setTitle(to_string(title))
 
-    property icon:
-        def __set__(self, Pixels icon):
-            self.p_window.setIcon(icon.m_width, icon.m_height, icon.p_array)
+    def set_icon(self, int width, int height, bytes pixels):
+        self.p_window.setIcon(width, height, <sf.Uint8*>pixels)
 
     property visible:
         def __set__(self, bint visible):