Fix warning hidden ‘ciMonFont::DrawText’ [-Werror=overloaded-virtual] (Closes #1034)

3 files changed, 4 insertions, 3 deletions

diff --git a/ffont.h b/ffont.h
index 3521c49..2681650 100644
--- a/ffont.h
+++ b/ffont.h
@@ -66,6 +66,7 @@ private:
   int Kerning(ciMonGlyph *Glyph, uint PrevSym) const;
   ciMonGlyph* Glyph(uint CharCode) const;
   virtual void DrawText(cBitmap*, int, int, const char*, tColor, tColor, int) const {};
+  virtual void DrawText(cPixmap*, int, int, const char*, tColor, tColor, int) const {};
 public:
   ciMonFont(const char *Name, int CharHeight, int CharWidth = 0);
   virtual ~ciMonFont();
diff --git a/imon.c b/imon.c
index 43d48a6..789a76e 100644
--- a/imon.c
+++ b/imon.c
@@ -626,9 +626,9 @@ void ciMonLCD::setBuiltinProgressBars(int topLine, int botLine,
  * \param length The length of the bar.
  * \return The pixmap that represents the given length.
  */
-int ciMonLCD::lengthToPixels(int length)
+unsigned int ciMonLCD::lengthToPixels(int length)
 {
-	int pixLen[] =
+	unsigned int pixLen[] =
 	{
 		0x00, 0x00000080, 0x000000c0, 0x000000e0, 0x000000f0,
 		0x000000f8, 0x000000fc, 0x000000fe, 0x000000ff,
diff --git a/imon.h b/imon.h
index 14cff8d..0f588f7 100644
--- a/imon.h
+++ b/imon.h
@@ -109,7 +109,7 @@ protected:
 
   void setLineLength(int topLine, int botLine, int topProgress, int botProgress);
   void setBuiltinProgressBars(int topLine, int botLine, int topProgress, int botProgress);
-  int lengthToPixels(int length);
+  unsigned int lengthToPixels(int length);
 
   bool SendCmd(const uint64_t & cmdData);
   bool SendCmdClock(time_t tAlarm);