Ticket #9653: libmythui.diff

File libmythui.diff, 1.6 KB (added by Lawrence Rust <lvr@…>, 10 years ago)
  • mythtv/libs/libmythui/DisplayResOSX.cpp

    diff --git a/mythtv/libs/libmythui/DisplayResOSX.cpp b/mythtv/libs/libmythui/DisplayResOSX.cpp
    index f36cec0..e536542 100644
     
    11
    22#include "DisplayResOSX.h"
    33
    4 #import <CoreGraphics/CGBase.h>
    5 #import <CoreGraphics/CGDisplayConfiguration.h>
    64#import <Carbon/Carbon.h>
    75#import <IOKit/graphics/IOGraphicsLib.h> // for IODisplayCreateInfoDictionary()
    86
  • mythtv/libs/libmythui/mythrender_opengl.cpp

    diff --git a/mythtv/libs/libmythui/mythrender_opengl.cpp b/mythtv/libs/libmythui/mythrender_opengl.cpp
    index a1718f1..71b5786 100644
    void MythRenderOpenGL::InitFeatures(void) 
    12121212{
    12131213    m_exts_supported = kGLFeatNone;
    12141214
    1215     GLint maxtexsz = 0;
     1215    GLint maxtexsz = 0, max_units;
    12161216    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;
    12181218    m_max_tex_size = (maxtexsz) ? maxtexsz : 512;
    12191219
    12201220    m_extensions = (const char*) glGetString(GL_EXTENSIONS);
  • mythtv/libs/libmythui/util-osx-cocoa.mm

    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) 
    4848    if (!screen)
    4949        return NULL;
    5050    NSDictionary* desc = [screen deviceDescription];
    51     return [[desc objectForKey:@"NSScreenNumber"] intValue];
     51    return (CGDirectDisplayID)[[desc objectForKey:@"NSScreenNumber"] intValue];
    5252}