Prefer use of monitor's vars

BoboTiG · BoboTiG · commit 6768994756d6 · 2016-10-21T23:43:32.000+02:00
diff --git a/mss/darwin.py b/mss/darwin.py
@@ -141,9 +141,8 @@ def enum_display_monitors(self, force=False):
     def get_pixels(self, monitor):
         ''' Retrieve all pixels from a monitor. Pixels have to be RGB. '''
 
-        width, height = monitor['width'], monitor['height']
-        left, top = monitor['left'], monitor['top']
-        rect = CGRect((left, top), (width, height))
+        rect = CGRect((monitor['left'], monitor['top']),
+                      (monitor['width'], monitor['height']))
 
         image_ref = self.core.CGWindowListCreateImage(rect, 1, 0, 0)
         if not image_ref:
@@ -155,7 +154,7 @@ def get_pixels(self, monitor):
         prov = self.core.CGImageGetDataProvider(image_ref)
         data = self.core.CGDataProviderCopyData(prov)
         data_ref = self.core.CFDataGetBytePtr(data)
-        buf_len = self.height * self.width * 4  # or CFDataGetLength()
+        buf_len = self.width * self.height * 4
         data = cast(data_ref, POINTER(c_ubyte * buf_len))
         self.core.CGDataProviderRelease(prov)
         self.image = self.bgra_to_rgb(bytearray(data.contents))
diff --git a/mss/linux.py b/mss/linux.py
@@ -227,9 +227,8 @@ def get_pixels(self, monitor):
 
         ximage = self.xlib.XGetImage(self.display, root,
                                      monitor['left'], monitor['top'],
-                                     self.width, self.height,
-                                     0x00ffffff,
-                                     2)  # ZPIXMAP
+                                     monitor['width'], monitor['height'],
+                                     0x00ffffff, 2)  # ZPIXMAP
         if not ximage:
             err = 'xlib.XGetImage() failed. Monitor informations: '
             for key, val in sorted(monitor.items()):
diff --git a/mss/windows.py b/mss/windows.py
@@ -128,28 +128,30 @@ def get_pixels(self, monitor):
         try:
             bmi = BITMAPINFO()
             bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER)
-            bmi.bmiHeader.biWidth = self.width
-            bmi.bmiHeader.biHeight = -self.height  # Why minux? See [1]
+            bmi.bmiHeader.biWidth = monitor['width']
+            bmi.bmiHeader.biHeight = -monitor['height']  # Why minus? See [1]
             bmi.bmiHeader.biPlanes = 1  # Always 1
             bmi.bmiHeader.biBitCount = 32  # See [2]
             bmi.bmiHeader.biCompression = 0  # 0 = BI_RGB (no compression)
             bmi.bmiHeader.biClrUsed = 0  # See [3]
             bmi.bmiHeader.biClrImportant = 0  # See [3]
 
-            buf_len = self.height * self.width * 4  # See [2]
+            buf_len = monitor['width'] * monitor['height'] * 4  # See [2]
             image_data = create_string_buffer(buf_len)
             srcdc = windll.user32.GetWindowDC(0)
             memdc = windll.gdi32.CreateCompatibleDC(srcdc)
-            bmp = windll.gdi32.CreateCompatibleBitmap(srcdc, self.width,
-                                                      self.height)
+            bmp = windll.gdi32.CreateCompatibleBitmap(
+                srcdc, monitor['width'], monitor['height'])
+
             windll.gdi32.SelectObject(memdc, bmp)
             windll.gdi32.BitBlt(memdc, 0, 0,
-                                self.width, self.height,
+                                monitor['width'], monitor['height'],
                                 srcdc,
                                 monitor['left'], monitor['top'],
                                 0xcc0020)  # SRCCOPY
-            bits = windll.gdi32.GetDIBits(memdc, bmp, 0, self.height,
-                                          image_data, bmi, 0)
+
+            bits = windll.gdi32.GetDIBits(
+                memdc, bmp, 0, monitor['height'], image_data, bmi, 0)
             if bits != self.height:
                 raise ScreenshotError('gdi32.GetDIBits() failed.')
         finally:
