cImageFile: scaling support for non-ImageMagick files (-> pbm, glcd); serdisp.[ch]: paranoia checks (SetBrightness()!), encapsulation of touch events; cImageCache: syslog message after successful loading of an image; cSkinObject: beauty fix

1 files changed, 7 insertions, 6 deletions

diff --git a/glcdgraphics/imagefile.h b/glcdgraphics/imagefile.h
index bc7e835..2cc1eba 100644
--- a/glcdgraphics/imagefile.h
+++ b/glcdgraphics/imagefile.h
@@ -21,18 +21,19 @@ class cImage;
 
 class cImageFile
 {
+private:
+    uint32_t Blend(uint32_t fgcol, uint32_t bgcol, uint8_t level, double antiAliasGranularity = 0.0) const;
+protected:
+    bool Scale(cImage & image, uint16_t scalew, uint16_t scaleh, bool AntiAlias = false);
 public:
     cImageFile();
     virtual ~cImageFile();
     virtual bool Load(cImage & image, const std::string & fileName);
     virtual bool Save(cImage & image, const std::string & fileName);
 
-    virtual bool SupportsScaling(void) { return false; }
-    virtual bool LoadScaled(cImage & image, const std::string & fileName, uint16_t & scalew, uint16_t & scaleh) {
-        scalew = 0;
-        scaleh = 0;
-        return Load(image, fileName);
-    }
+    virtual bool SupportsScaling(void) { return true; }
+
+    virtual bool LoadScaled(cImage & image, const std::string & fileName, uint16_t & scalew, uint16_t & scaleh);
 };
 
 } // end of namespace