frodovdr
/
vdr-plugin-softhdcuvid
mirror of https://github.com/jojo61/vdr-plugin-softhdcuvid.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use FT_ULong instead of uint

This commit is contained in:
jojo61 2020-02-26 16:52:48 +01:00
parent a5b81f8de1
commit 03e69b5e26
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openglosd.cpp
View File

@ -270,7 +270,7 @@ bool cShader::CheckCompileErrors(GLuint object, bool program) {
/**************************************************************************************** /****************************************************************************************
* cOglGlyph * cOglGlyph
****************************************************************************************/ ****************************************************************************************/
cOglGlyph::cOglGlyph(uint charCode, FT_BitmapGlyph ftGlyph) { cOglGlyph::cOglGlyph(FT_ULong charCode, FT_BitmapGlyph ftGlyph) {
this->charCode = charCode; this->charCode = charCode;
bearingLeft = ftGlyph->left; bearingLeft = ftGlyph->left;
bearingTop = ftGlyph->top; bearingTop = ftGlyph->top;
@ -389,7 +389,7 @@ void cOglFont::Cleanup(void) {
esyslog("failed to deinitialize FreeType library!"); esyslog("failed to deinitialize FreeType library!");
} }
cOglGlyph* cOglFont::Glyph(uint charCode) const { cOglGlyph* cOglFont::Glyph(FT_ULong charCode) const {
// Non-breaking space: // Non-breaking space:
if (charCode == 0xA0) if (charCode == 0xA0)
charCode = 0x20; charCode = 0x20;

8
openglosd.h
View File

@ -110,7 +110,7 @@ class cOglGlyph:public cListObject
uint prevSym; uint prevSym;
GLfloat kerning; GLfloat kerning;
}; };
uint charCode; FT_ULong charCode;
int bearingLeft; int bearingLeft;
int bearingTop; int bearingTop;
int width; int width;
@ -122,9 +122,9 @@ class cOglGlyph:public cListObject
void LoadTexture(FT_BitmapGlyph ftGlyph); void LoadTexture(FT_BitmapGlyph ftGlyph);
public: public:
cOglGlyph(uint charCode, FT_BitmapGlyph ftGlyph); cOglGlyph(FT_ULong charCode, FT_BitmapGlyph ftGlyph);
virtual ~ cOglGlyph(); virtual ~ cOglGlyph();
uint CharCode(void) FT_ULong CharCode(void)
{ {
return charCode; return charCode;
} }
@ -190,7 +190,7 @@ class cOglFont:public cListObject
{ {
return height; return height;
}; };
cOglGlyph *Glyph(uint charCode) const; cOglGlyph *Glyph(FT_ULong charCode) const;
int Kerning(cOglGlyph * glyph, uint prevSym) const; int Kerning(cOglGlyph * glyph, uint prevSym) const;
}; };

8
video.h
View File

@ -248,6 +248,14 @@ extern int VideoRaiseWindow(void);
#ifdef USE_OPENGLOSD #ifdef USE_OPENGLOSD
extern void ActivateOsd(GLuint, int, int, int, int); extern void ActivateOsd(GLuint, int, int, int, int);
#endif #endif
#ifdef GAMMA
extern void Init_Gamma();
extern void Exit_Gamma();
extern void Set_Gamma(float, int);
extern void Get_Gamma();
#endif
#if 0 #if 0
long int gettid() long int gettid()
{ {