Merge lp:~r-reilink/pyopengl/pyopengl into lp:pyopengl

Proposed by Rob Reilink
Status: Merged
Merged at revision: 489
Proposed branch: lp:~r-reilink/pyopengl/pyopengl
Merge into: lp:pyopengl
Diff against target: 20 lines (+2/-1)
1 file modified
OpenGL/platform/baseplatform.py (+2/-1)
To merge this branch: bzr merge lp:~r-reilink/pyopengl/pyopengl
Reviewer Review Type Date Requested Status
Mike C. Fletcher Pending
Review via email: mp+103881@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'OpenGL/platform/baseplatform.py'
--- OpenGL/platform/baseplatform.py 2012-02-03 12:16:53 +0000
+++ OpenGL/platform/baseplatform.py 2012-04-27 14:07:22 +0000
@@ -2,6 +2,7 @@
2"""2"""
3import ctypes3import ctypes
4from OpenGL.platform import ctypesloader4from OpenGL.platform import ctypesloader
5from OpenGL._bytes import as_8_bit
5import sys6import sys
6from OpenGL import _configflags7from OpenGL import _configflags
7from OpenGL import logs, MODULE_ANNOTATIONS8from OpenGL import logs, MODULE_ANNOTATIONS
@@ -139,7 +140,7 @@
139 if extension and not self.EXTENSIONS_USE_BASE_FUNCTIONS:140 if extension and not self.EXTENSIONS_USE_BASE_FUNCTIONS:
140 # what about the VERSION values???141 # what about the VERSION values???
141 if self.checkExtension( extension ):142 if self.checkExtension( extension ):
142 pointer = self.getExtensionProcedure( functionName )143 pointer = self.getExtensionProcedure( as_8_bit(functionName) )
143 if pointer:144 if pointer:
144 func = self.functionTypeFor( dll )(145 func = self.functionTypeFor( dll )(
145 resultType,146 resultType,

Subscribers

People subscribed via source and target branches

to all changes: