diff --git a/mythtv/libs/libmythui/DisplayResOSX.cpp b/mythtv/libs/libmythui/DisplayResOSX.cpp
index f36cec0..e536542 100644
|
|
|
1 | 1 | |
2 | 2 | #include "DisplayResOSX.h" |
3 | 3 | |
4 | | #import <CoreGraphics/CGBase.h> |
5 | | #import <CoreGraphics/CGDisplayConfiguration.h> |
6 | 4 | #import <Carbon/Carbon.h> |
7 | 5 | #import <IOKit/graphics/IOGraphicsLib.h> // for IODisplayCreateInfoDictionary() |
8 | 6 | |
diff --git a/mythtv/libs/libmythui/mythrender_opengl.cpp b/mythtv/libs/libmythui/mythrender_opengl.cpp
index a1718f1..71b5786 100644
|
|
void MythRenderOpenGL::InitFeatures(void) |
1212 | 1212 | { |
1213 | 1213 | m_exts_supported = kGLFeatNone; |
1214 | 1214 | |
1215 | | GLint maxtexsz = 0; |
| 1215 | GLint maxtexsz = 0, max_units; |
1216 | 1216 | glGetIntegerv(GL_MAX_TEXTURE_SIZE, &maxtexsz); |
1217 | | glGetIntegerv(GL_MAX_TEXTURE_UNITS, &m_max_units); |
| 1217 | glGetIntegerv(GL_MAX_TEXTURE_UNITS, &max_units), m_max_units = max_units; |
1218 | 1218 | m_max_tex_size = (maxtexsz) ? maxtexsz : 512; |
1219 | 1219 | |
1220 | 1220 | m_extensions = (const char*) glGetString(GL_EXTENSIONS); |
diff --git a/mythtv/libs/libmythui/util-osx-cocoa.mm b/mythtv/libs/libmythui/util-osx-cocoa.mm
index 4a3e0ee..e9c1729 100644
|
|
CGDirectDisplayID GetOSXCocoaDisplay(void* view) |
48 | 48 | if (!screen) |
49 | 49 | return NULL; |
50 | 50 | NSDictionary* desc = [screen deviceDescription]; |
51 | | return [[desc objectForKey:@"NSScreenNumber"] intValue]; |
| 51 | return (CGDirectDisplayID)[[desc objectForKey:@"NSScreenNumber"] intValue]; |
52 | 52 | } |