Fix get_pixels: now it returns an image object with all pixels data

BoboTiG · BoboTiG · commit 316d7fc6ce16 · 2014-03-18T12:40:47.000+01:00
diff --git a/mss.py b/mss.py
@@ -155,7 +155,6 @@ def __init__(self, debug=False):
         ''' Global vars and class overload. '''
 
         self.DEBUG = debug in [True, 'on' 'yes', 'oui', 1]
-
         self.debug('__init__', 'DEBUG', self.DEBUG)
         self.init()
 
@@ -350,10 +349,10 @@ def get_pixels(self, monitor):
         self.image = CGWindowListCreateImage(
             rect, kCGWindowListOptionOnScreenOnly,
             kCGNullWindowID, kCGWindowImageDefault)
-        return 1
+        return self.image
 
     def save_img(self, data, width, height, output):
-        ''' Use our own save_img() method. Because I'm Mac ... '''
+        ''' Use my own save_img() method. Because I'm Mac ... '''
 
         self.debug('MSSMac: save_img()')
 
@@ -364,7 +363,7 @@ def save_img(self, data, width, height, output):
             kCGImagePropertyDPIWidth: dpi,
             kCGImagePropertyDPIHeight: dpi,
             }
-        CGImageDestinationAddImage(dest, self.image, properties)
+        CGImageDestinationAddImage(dest, data, properties)
 
 
 class MSSLinux(MSS):
@@ -581,7 +580,8 @@ def pix(pixel, _resultats={}):
                   for y in range(height) for x in range(width)]
 
         self.xlib.XFree(image)
-        return b''.join(pixels)
+        self.image = b''.join(pixels)
+        return self.image
 
 
 class MSSWindows(MSS):
@@ -733,7 +733,8 @@ def _arrange(self, data, width, height):
             for x in range(0, width - 2, 3):
                 scanlines[off+x:off+x+3] = \
                     b(data[offset+x+2]), b(data[offset+x+1]), b(data[offset+x])
-        return b''.join(scanlines)
+        self.image = b''.join(scanlines)
+        return self.image
 
 
 def main(argv=[]):
