webp image support

#273

Author: BlueAndi

lib/FileMgrService/library.json

@@ -19,6 +19,8 @@
         "name": "TopicHandlerService"
     }, {
         "name": "Utilities"
+    }, {
+        "name": "YAWidgets"
     }],
     "frameworks": "*",
     "platforms": "*"

lib/FileMgrService/src/FileMgrService.cpp

@@ -41,6 +41,7 @@
 #include <SettingsService.h>
 #include <TopicHandlerService.h>
 #include <JsonFile.h>
+#include <BitmapWidget.h>
 
 /******************************************************************************
  * Compiler Switches
@@ -69,10 +70,6 @@ const char* FileMgrService::ENTITY_ID         = "fileMgrService";
 const char* FileMgrService::TOPIC_FILES       = "files";
 const char* FileMgrService::TOPIC_UPLOAD      = "upload";
 const char* FileMgrService::TOPIC_REMOVE      = "remove";
-const char* FileMgrService::FILE_EXTENSIONS[] = {
-    ".bmp",
-    ".gif"
-};
 
 /******************************************************************************
  * Public Methods
@@ -130,7 +127,7 @@ bool FileMgrService::start()
     }
 
     /* Add new files to file table. */
-    if (true == scanForFiles(m_fileTable, FILE_EXTENSIONS, UTIL_ARRAY_NUM(FILE_EXTENSIONS)))
+    if (true == scanForFiles(m_fileTable, BitmapWidget::IMAGE_FILE_EXTENSIONS, BitmapWidget::IMAGE_FILE_EXTENSIONS_COUNT))
     {
         m_hasFileTableChanged = true;
         m_isDirty             = true;
@@ -467,30 +464,14 @@ bool FileMgrService::isUploadAccepted(const String& topic, const String& srcFile
 
     if (true == topic.equals(TOPIC_UPLOAD))
     {
-        size_t idx;
-
         /* Accept only files with the right file extension. */
-        for (idx = 0U; idx < UTIL_ARRAY_NUM(FILE_EXTENSIONS); ++idx)
-        {
-            int32_t fileExtIdx = srcFilename.lastIndexOf(".");
-
-            if (0 <= fileExtIdx)
-            {
-                String fileExt = srcFilename.substring(fileExtIdx);
-
-                if (true == fileExt.equalsIgnoreCase(FILE_EXTENSIONS[idx]))
-                {
-                    isAccepted = true;
-                    break;
-                }
-            }
-        }
-
-        if (true == isAccepted)
+        if (true == BitmapWidget::isImageTypeSupported(srcFilename))
         {
             dstFilename  = WORKING_DIRECTORY;
             dstFilename += "/";
             dstFilename += srcFilename;
+
+            isAccepted = true;
         }
     }
 

lib/FileMgrService/src/FileMgrService.h

@@ -193,11 +193,6 @@ class FileMgrService : public IService
      */
     static const char* TOPIC_REMOVE;
 
-    /**
-     * Supported file extensions.
-     */
-    static const char* FILE_EXTENSIONS[];
-
     /**
      * Timer period in ms to check whether the file table is dirty and needs
      * to be saved to the configuration file.

lib/YAWidgets/library.json

@@ -23,6 +23,8 @@
         "name": "Fonts"
     }, {
         "name": "Utilities"
+    }, {
+        "name": "libwebp"
     }],
     "frameworks": "*",
     "platforms": "*"

lib/YAWidgets/src/GifImgPlayer.cpp

@@ -35,8 +35,6 @@
  *****************************************************************************/
 #include "GifImgPlayer.h"
 #include "LzwDecoder.h"
-#include "GifFileLoader.h"
-#include "GifFileToMemLoader.h"
 #include <Logging.h>
 #include <TypedAllocator.hpp>
 
@@ -372,7 +370,7 @@ GifImgPlayer& GifImgPlayer::operator=(const GifImgPlayer& player)
     return *this;
 }
 
-GifImgPlayer::Ret GifImgPlayer::open(FS& fs, const String& fileName, IGifLoader& loader)
+GifImgPlayer::Ret GifImgPlayer::open(FS& fs, const String& fileName, IImageLoader& loader)
 {
     Ret ret = RET_OK;
 

lib/YAWidgets/src/GifImgPlayer.h

@@ -49,7 +49,7 @@
 #include <YAGfxCanvas.h>
 #include <YAGfxBitmap.h>
 #include <SimpleTimer.hpp>
-#include <IGifLoader.h>
+#include <IImageLoader.h>
 #include <TypedAllocator.hpp>
 #include <PsAllocator.hpp>
 
@@ -131,11 +131,11 @@ class GifImgPlayer
      *
      * @param[in] fs        Filesystem to use
      * @param[in] fileName  Name of the GIF file.
-     * @param[in] loader    GIF file loader to use.
+     * @param[in] loader    Image file loader to use.
      *
      * @return Status informtion
      */
-    Ret open(FS& fs, const String& fileName, IGifLoader& loader);
+    Ret open(FS& fs, const String& fileName, IImageLoader& loader);
 
     /**
      * Close the GIF file.
@@ -236,7 +236,7 @@ class GifImgPlayer
     PaletteColorAllocator                        m_paletteColorAllocator;  /**< Palette color allocator. */
     DataAllocator                                m_dataAllocator;          /**< uint8_t allocator. */
     YAGfxDynamicBitmap                           m_bitmap;                 /**< The bitmap contains the last drawn scene. */
-    IGifLoader*                                  m_gifLoader;              /**< GIF file loader used to read the file. */
+    IImageLoader*                                m_gifLoader;              /**< GIF file loader used to read the file. */
     YAGfxCanvas                                  m_canvas;                 /**< Canvas used for drawing each scene. Its position and size follows the image descriptor. */
     uint8_t                                      m_bgColorIndex;           /**< Background color index. Used by disposal method. */
     PaletteColor*                                m_globalColorTable;       /**< Global color table. */

lib/YAWidgets/src/IGifLoader.h lib/YAWidgets/src/IImageLoader.hlib/YAWidgets/src/IGifLoader.h renamed to lib/YAWidgets/src/IImageLoader.h

@@ -25,17 +25,17 @@
     DESCRIPTION
 *******************************************************************************/
 /**
- * @file   IGifLoader.h
- * @brief  Interface of GIF loader
+ * @file   IImageLoader.h
+ * @brief  Interface of image loader
  * @author Andreas Merkle <[email protected]>
  *
  * @addtogroup GFX
  *
  * @{
  */
 
-#ifndef IGIFLOADER_H
-#define IGIFLOADER_H
+#ifndef IIMAGELOADER_H
+#define IIMAGELOADER_H
 
 /******************************************************************************
  * Compile Switches
@@ -57,36 +57,36 @@
  *****************************************************************************/
 
 /**
- * Interface for GIF file loader.
+ * Interface for image file loader.
  */
-class IGifLoader
+class IImageLoader
 {
 public:
 
     /**
      * Destroy the interface.
      */
-    virtual ~IGifLoader()
+    virtual ~IImageLoader()
     {
     }
 
     /**
-     * Open a GIF file.
+     * Open an image file.
      *
      * @param[in] fs        Filesystem to use
-     * @param[in] fileName  Name of the GIF file.
+     * @param[in] fileName  Name of the image file.
      *
      * @return If successful, it will return true otherwise false.
      */
     virtual bool open(FS& fs, const String& fileName) = 0;
 
     /**
-     * Close the GIF file.
+     * Close the image file.
      */
     virtual void close()                              = 0;
 
     /**
-     * Read data from GIF.
+     * Read data from image.
      *
      * @param[in] buffer    Buffer to fill.
      * @param[in] size      Buffer size in bytes.
@@ -124,7 +124,7 @@ class IGifLoader
     /**
      * Construct the interface.
      */
-    IGifLoader()
+    IImageLoader()
     {
     }
 };
@@ -133,6 +133,6 @@ class IGifLoader
  * Functions
  *****************************************************************************/
 
-#endif /* IGIFLOADER_H */
+#endif /* IIMAGELOADER_H */
 
 /** @} */

lib/YAWidgets/src/GifFileLoader.h lib/YAWidgets/src/ImageFileLoader.hlib/YAWidgets/src/GifFileLoader.h renamed to lib/YAWidgets/src/ImageFileLoader.h

@@ -25,17 +25,17 @@
     DESCRIPTION
 *******************************************************************************/
 /**
- * @file   GifFileLoader.h
- * @brief  GIF file loader
+ * @file   ImageFileLoader.h
+ * @brief  Image file loader
  * @author Andreas Merkle <[email protected]>
  *
  * @addtogroup GFX
  *
  * @{
  */
 
-#ifndef GIF_FILE_LOADER_H
-#define GIF_FILE_LOADER_H
+#ifndef IMAGE_FILE_LOADER_H
+#define IMAGE_FILE_LOADER_H
 
 /******************************************************************************
  * Compile Switches
@@ -44,7 +44,7 @@
 /******************************************************************************
  * Includes
  *****************************************************************************/
-#include "IGifLoader.h"
+#include "IImageLoader.h"
 
 /******************************************************************************
  * Macros
@@ -55,48 +55,48 @@
  *****************************************************************************/
 
 /**
- * GIF file loader.
+ * Image file loader.
  */
-class GifFileLoader : public IGifLoader
+class ImageFileLoader : public IImageLoader
 {
 public:
 
     /**
-     * Construct the GIF file loader.
+     * Construct the image file loader.
      */
-    GifFileLoader() :
-        IGifLoader(),
+    ImageFileLoader() :
+        IImageLoader(),
         m_fd()
     {
     }
 
     /**
-     * Construct the GIF file loader by copy.
+     * Construct the image file loader by copy.
      *
-     * @param[in] loader    GIF file loader to copy.
+     * @param[in] loader    Image file loader to copy.
      */
-    GifFileLoader(const GifFileLoader& loader) :
-        IGifLoader(),
+    ImageFileLoader(const ImageFileLoader& loader) :
+        IImageLoader(),
         m_fd(loader.m_fd)
     {
     }
 
     /**
-     * Destroy the GIF file loader.
+     * Destroy the image file loader.
      */
-    ~GifFileLoader() override
+    ~ImageFileLoader() override
     {
         close();
     }
 
     /**
      * Assignment operator.
      *
-     * @param[in] loader    GIF file loader to copy.
+     * @param[in] loader    Image file loader to copy.
      *
      * @return Reference to this loader.
      */
-    GifFileLoader& operator=(const GifFileLoader& loader)
+    ImageFileLoader& operator=(const ImageFileLoader& loader)
     {
         if (this != &loader)
         {
@@ -109,10 +109,10 @@ class GifFileLoader : public IGifLoader
     }
 
     /**
-     * Open a GIF file.
+     * Open an image file.
      *
      * @param[in] fs        Filesystem to use.
-     * @param[in] fileName  Name of the GIF file.
+     * @param[in] fileName  Name of the image file.
      *
      * @return If successful, it will return true otherwise false.
      */
@@ -131,7 +131,7 @@ class GifFileLoader : public IGifLoader
     }
 
     /**
-     * Close the GIF file.
+     * Close the image file.
      */
     void close() final
     {
@@ -142,7 +142,7 @@ class GifFileLoader : public IGifLoader
     }
 
     /**
-     * Read data from GIF.
+     * Read data from image.
      *
      * @param[in] buffer    Buffer to fill.
      * @param[in] size      Buffer size in bytes.
@@ -208,6 +208,6 @@ class GifFileLoader : public IGifLoader
  * Functions
  *****************************************************************************/
 
-#endif /* GIF_FILE_LOADER_H */
+#endif /* IMAGE_FILE_LOADER_H */
 
 /** @} */