diff options
| author | Mattias Andrée <maandree@operamail.com> | 2014-04-05 02:24:39 +0200 |
|---|---|---|
| committer | Mattias Andrée <maandree@operamail.com> | 2014-04-05 02:24:39 +0200 |
| commit | 233a40052651c9ca908266623fe189bb794d04fe (patch) | |
| tree | 5269e05cd5ff04a1468ec2b8b001b2c149ae9e67 /src/blueshift_vidmode.pyx | |
| parent | document (diff) | |
| download | blueshift-233a40052651c9ca908266623fe189bb794d04fe.tar.gz blueshift-233a40052651c9ca908266623fe189bb794d04fe.tar.bz2 blueshift-233a40052651c9ca908266623fe189bb794d04fe.tar.xz | |
portability
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src/blueshift_vidmode.pyx')
| -rw-r--r-- | src/blueshift_vidmode.pyx | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/src/blueshift_vidmode.pyx b/src/blueshift_vidmode.pyx index a4be816..4133548 100644 --- a/src/blueshift_vidmode.pyx +++ b/src/blueshift_vidmode.pyx @@ -17,6 +17,7 @@ cimport cython from libc.stdlib cimport malloc, free +from libc.stdint cimport * cdef extern int blueshift_vidmode_open(int use_screen, char* display) @@ -28,10 +29,7 @@ Start stage of colour curve control @return Zero on error, otherwise the size of colours curves ''' -cdef extern int blueshift_vidmode_read(int use_crtc, - unsigned short int* r_curve, - unsigned short int* g_curve, - unsigned short int* b_curve) +cdef extern int blueshift_vidmode_read(int use_crtc, uint16_t* r_curve, uint16_t* g_curve, uint16_t* b_curve) ''' Gets the current colour curves @@ -43,9 +41,7 @@ Gets the current colour curves ''' cdef extern int blueshift_vidmode_apply(unsigned long long int use_crtcs, - unsigned short int* r_curve, - unsigned short int* g_curve, - unsigned short int* b_curve) + uint16_t* r_curve, uint16_t* g_curve, uint16_t* b_curve) ''' Apply stage of colour curve control @@ -70,17 +66,17 @@ The size of the curves vidmode_gamma_size = 0 -cdef unsigned short int* r_c +cdef uint16_t* r_c ''' Storage space for the red colour curve in C native data structure ''' -cdef unsigned short int* g_c +cdef uint16_t* g_c ''' Storage space for the green colour curve in C native data structure ''' -cdef unsigned short int* b_c +cdef uint16_t* b_c ''' Storage space for the blue colour curve in C native data structure ''' @@ -101,9 +97,9 @@ def vidmode_open(int use_screen, display): if display is not None: display_ = display # Allocate the storage space for the C native colour curves - r_c = <unsigned short int*>malloc(256 * 2) - g_c = <unsigned short int*>malloc(256 * 2) - b_c = <unsigned short int*>malloc(256 * 2) + r_c = <uint16_t*>malloc(256 * sizeof(uint16_t)) + g_c = <uint16_t*>malloc(256 * sizeof(uint16_t)) + b_c = <uint16_t*>malloc(256 * sizeof(uint16_t)) # Check for out-of-memory error if (r_c is NULL) or (g_c is NULL) or (b_c is NULL): raise MemoryError() @@ -136,11 +132,11 @@ def vidmode_apply(unsigned long long use_crtcs, r_curve, g_curve, b_curve): ''' Apply stage of colour curve control - @param use_crtcs Mask of CRTC:s to use - @param r_curve:list<unsigned short int> The red colour curve - @param g_curve:list<unsigned short int> The green colour curve - @param b_curve:list<unsigned short int> The blue colour curve - @return Zero on success + @param use_crtcs Mask of CRTC:s to use + @param r_curve:list<int> The red colour curve + @param g_curve:list<int> The green colour curve + @param b_curve:list<int> The blue colour curve + @return Zero on success ''' # Convert curves to 16-bit C integers for i in range(256): |