diff options
| author | Kamil Zbróg | 2013-11-26 18:53:03 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2013-11-26 18:53:03 +0000 |
| commit | 15bb1c61eda48f09253ccb8d2a42ccad59f3b00a (patch) | |
| tree | c2f5ac2907225730c6f1cdaa000f549ef7951183 /graphics/fonts/bdf.h | |
| parent | 446c57d281e592653c9935c896d33334d23f0519 (diff) | |
| parent | e1afc7d0d777dad4b7ca0a58f0bb0324b24f9584 (diff) | |
| download | scummvm-rg350-15bb1c61eda48f09253ccb8d2a42ccad59f3b00a.tar.gz scummvm-rg350-15bb1c61eda48f09253ccb8d2a42ccad59f3b00a.tar.bz2 scummvm-rg350-15bb1c61eda48f09253ccb8d2a42ccad59f3b00a.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Conflicts:
engines/configure.engines
engines/engines.mk
engines/plugins_table.h
Diffstat (limited to 'graphics/fonts/bdf.h')
| -rw-r--r-- | graphics/fonts/bdf.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/fonts/bdf.h b/graphics/fonts/bdf.h index b0166a2095..842e54f851 100644 --- a/graphics/fonts/bdf.h +++ b/graphics/fonts/bdf.h @@ -61,14 +61,14 @@ public: virtual int getFontHeight() const; virtual int getMaxCharWidth() const; - virtual int getCharWidth(byte chr) const; - virtual void drawChar(Surface *dst, byte chr, int x, int y, uint32 color) const; + virtual int getCharWidth(uint32 chr) const; + virtual void drawChar(Surface *dst, uint32 chr, int x, int y, uint32 color) const; static BdfFont *loadFont(Common::SeekableReadStream &stream); static bool cacheFontData(const BdfFont &font, const Common::String &filename); static BdfFont *loadFromCache(Common::SeekableReadStream &stream); private: - int mapToIndex(byte ch) const; + int mapToIndex(uint32 ch) const; const BdfFontData _data; const DisposeAfterUse::Flag _dispose; |