Fix offsets in byref

dev7355608 · Sep 18, 2017 · 208efea · 208efea
1 parent 6ea48b9
commit 208efea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/gamma/gamma_quartz.py b/gamma/gamma_quartz.py
@@ -1,4 +1,4 @@
-from ctypes import byref, c_float, c_uint32, cdll
+from ctypes import byref, sizeof, c_float, c_uint32, cdll
 from ctypes.util import find_library
 
 
@@ -61,9 +61,9 @@ def set(self, func):
             for i in range(ramp_size):
                 ramp[0][i] = ramp[1][i] = ramp[2][i] = func(i / ramp_size)
 
-            gamma_r = byref(ramp, 0 * ramp_size)
-            gamma_g = byref(ramp, 1 * ramp_size)
-            gamma_b = byref(ramp, 2 * ramp_size)
+            gamma_r = byref(ramp, 0 * ramp_size * sizeof(c_float))
+            gamma_g = byref(ramp, 1 * ramp_size * sizeof(c_float))
+            gamma_b = byref(ramp, 2 * ramp_size * sizeof(c_float))
 
             error = CGSetDisplayTransferByTable(display.id, display.ramp_size,
                                                 gamma_r, gamma_g, gamma_b)

diff --git a/gamma/gamma_vidmode.py b/gamma/gamma_vidmode.py
@@ -55,9 +55,9 @@ def __init__(self):
 
         ramp = (c_ushort * ramp_size * 3)()
 
-        gamma_r = byref(ramp, 0 * ramp_size)
-        gamma_g = byref(ramp, 1 * ramp_size)
-        gamma_b = byref(ramp, 2 * ramp_size)
+        gamma_r = byref(ramp, 0 * ramp_size * sizeof(c_ushort))
+        gamma_g = byref(ramp, 1 * ramp_size * sizeof(c_ushort))
+        gamma_b = byref(ramp, 2 * ramp_size * sizeof(c_ushort))
 
         if not XF86VidModeGetGammaRamp(display, screen_num, ramp_size,
                                        gamma_r, gamma_g, gamma_b):
@@ -77,9 +77,9 @@ def set(self, func):
             ramp[0][i] = ramp[1][i] = ramp[2][i] = \
                 int(C_USHORT_MAX * func(i / ramp_size))
 
-        gamma_r = byref(ramp, 0 * ramp_size)
-        gamma_g = byref(ramp, 1 * ramp_size)
-        gamma_b = byref(ramp, 2 * ramp_size)
+        gamma_r = byref(ramp, 0 * ramp_size * sizeof(c_ushort))
+        gamma_g = byref(ramp, 1 * ramp_size * sizeof(c_ushort))
+        gamma_b = byref(ramp, 2 * ramp_size * sizeof(c_ushort))
 
         if not XF86VidModeSetGammaRamp(display, screen_num, ramp_size,
                                        gamma_r, gamma_g, gamma_b):
@@ -93,9 +93,9 @@ def close(self):
             ramp_size = self._ramp_size
             ramp = self._saved_ramp
 
-            gamma_r = byref(ramp, 0 * ramp_size)
-            gamma_g = byref(ramp, 1 * ramp_size)
-            gamma_b = byref(ramp, 2 * ramp_size)
+            gamma_r = byref(ramp, 0 * ramp_size * sizeof(c_ushort))
+            gamma_g = byref(ramp, 1 * ramp_size * sizeof(c_ushort))
+            gamma_b = byref(ramp, 2 * ramp_size * sizeof(c_ushort))
 
             if not XF86VidModeSetGammaRamp(display, screen_num, ramp_size,
                                            gamma_r, gamma_g, gamma_b):