From 847e1d9ddf23f39327828de69d157377f0dd1a02 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Mon, 21 Oct 2019 21:06:42 +0200
Subject: [PATCH] BitmapBuffer::load renamed to BitmapBuffer::loadBitmap

---
 radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp | 4 ++--
 radio/src/thirdparty/libopenui/src/bitmapbuffer.h   | 2 +-
 radio/src/thirdparty/libopenui/src/static.h         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
index 7f78b1702..de671a657 100644
--- a/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
+++ b/radio/src/thirdparty/libopenui/src/bitmapbuffer.cpp
@@ -582,7 +582,7 @@ void drawSolidRect(BitmapBuffer * dc, coord_t x, coord_t y, coord_t w, coord_t h
 //  }
 //}
 
-BitmapBuffer * BitmapBuffer::load(const char * filename)
+BitmapBuffer * BitmapBuffer::loadBitmap(const char * filename)
 {
   const char * ext = getFileExtension(filename);
   if (ext && !strcmp(ext, ".bmp"))
@@ -593,7 +593,7 @@ BitmapBuffer * BitmapBuffer::load(const char * filename)
 
 BitmapBuffer * BitmapBuffer::loadMask(const char * filename)
 {
-  BitmapBuffer * bitmap = BitmapBuffer::load(filename);
+  BitmapBuffer * bitmap = BitmapBuffer::loadBitmap(filename);
   if (bitmap) {
     pixel_t * p = bitmap->getPixelPtr(0, 0);
     for (int i = bitmap->getWidth() * bitmap->getHeight(); i > 0; i--) {
diff --git a/radio/src/thirdparty/libopenui/src/bitmapbuffer.h b/radio/src/thirdparty/libopenui/src/bitmapbuffer.h
index 8677f7864..eb5664c6d 100644
--- a/radio/src/thirdparty/libopenui/src/bitmapbuffer.h
+++ b/radio/src/thirdparty/libopenui/src/bitmapbuffer.h
@@ -351,7 +351,7 @@ class BitmapBuffer: public BitmapBufferBase<uint16_t>
 
     void drawBitmapPatternPie(coord_t x0, coord_t y0, const uint8_t * img, LcdFlags flags, int startAngle, int endAngle);
 
-    static BitmapBuffer * load(const char * filename);
+    static BitmapBuffer * loadBitmap(const char * filename);
 
     static BitmapBuffer * loadMask(const char * filename);
 
diff --git a/radio/src/thirdparty/libopenui/src/static.h b/radio/src/thirdparty/libopenui/src/static.h
index 20c843d30..e99a304fe 100644
--- a/radio/src/thirdparty/libopenui/src/static.h
+++ b/radio/src/thirdparty/libopenui/src/static.h
@@ -69,7 +69,7 @@ class StaticBitmap: public Window {
   public:
     StaticBitmap(Window * parent, const rect_t & rect, const char * filename):
       Window(parent, rect),
-      bitmap(BitmapBuffer::load(filename))
+      bitmap(BitmapBuffer::loadBitmap(filename))
     {
     }