From 03e69b5e265694504dde97d0e7b7a02c53027a00 Mon Sep 17 00:00:00 2001 From: jojo61 Date: Wed, 26 Feb 2020 16:52:48 +0100 Subject: [PATCH] Use FT_ULong instead of uint --- openglosd.cpp | 4 ++-- openglosd.h | 8 ++++---- video.h | 8 ++++++++ 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/openglosd.cpp b/openglosd.cpp index 4cb4f05..6d57be1 100644 --- a/openglosd.cpp +++ b/openglosd.cpp @@ -270,7 +270,7 @@ bool cShader::CheckCompileErrors(GLuint object, bool program) { /**************************************************************************************** * cOglGlyph ****************************************************************************************/ -cOglGlyph::cOglGlyph(uint charCode, FT_BitmapGlyph ftGlyph) { +cOglGlyph::cOglGlyph(FT_ULong charCode, FT_BitmapGlyph ftGlyph) { this->charCode = charCode; bearingLeft = ftGlyph->left; bearingTop = ftGlyph->top; @@ -389,7 +389,7 @@ void cOglFont::Cleanup(void) { esyslog("failed to deinitialize FreeType library!"); } -cOglGlyph* cOglFont::Glyph(uint charCode) const { +cOglGlyph* cOglFont::Glyph(FT_ULong charCode) const { // Non-breaking space: if (charCode == 0xA0) charCode = 0x20; diff --git a/openglosd.h b/openglosd.h index e857843..c31a6e0 100644 --- a/openglosd.h +++ b/openglosd.h @@ -110,7 +110,7 @@ class cOglGlyph:public cListObject uint prevSym; GLfloat kerning; }; - uint charCode; + FT_ULong charCode; int bearingLeft; int bearingTop; int width; @@ -122,9 +122,9 @@ class cOglGlyph:public cListObject void LoadTexture(FT_BitmapGlyph ftGlyph); public: - cOglGlyph(uint charCode, FT_BitmapGlyph ftGlyph); + cOglGlyph(FT_ULong charCode, FT_BitmapGlyph ftGlyph); virtual ~ cOglGlyph(); - uint CharCode(void) + FT_ULong CharCode(void) { return charCode; } @@ -190,7 +190,7 @@ class cOglFont:public cListObject { return height; }; - cOglGlyph *Glyph(uint charCode) const; + cOglGlyph *Glyph(FT_ULong charCode) const; int Kerning(cOglGlyph * glyph, uint prevSym) const; }; diff --git a/video.h b/video.h index 7e39d4d..5440996 100644 --- a/video.h +++ b/video.h @@ -248,6 +248,14 @@ extern int VideoRaiseWindow(void); #ifdef USE_OPENGLOSD extern void ActivateOsd(GLuint, int, int, int, int); #endif + +#ifdef GAMMA +extern void Init_Gamma(); +extern void Exit_Gamma(); +extern void Set_Gamma(float, int); +extern void Get_Gamma(); +#endif + #if 0 long int gettid() {