Diff: Application/Image.h

Revision:

5:f4de114c31c3

Parent:

3:3fabfe3339b8

Child:

17:6e2abf107800

--- a/Application/Image.h	Fri Dec 19 16:40:30 2014 +0100
+++ b/Application/Image.h	Sun Dec 21 13:53:07 2014 +0100
@@ -18,6 +18,7 @@
 #define IMAGE_H
 
 #include "mbed.h"
+#include "rtos.h"
 
 /**
  * Image example
@@ -56,6 +57,7 @@
     enum Type {
         BMP = 0,
         PNG,
+        RAW,      /* Image prepared with the img_conv.jar tool */
         UNKNOWN
     };
     
@@ -69,6 +71,7 @@
         uint32_t   width;
         uint32_t   height;
         Resolution res;
+        void*      pointerToFree;
     } ImageData_t;
 
     /** Decodes the specified image data
@@ -97,12 +100,13 @@
      *  @param filename the file name and path
      *  @param res the format of the display
      *  @param pDataOut the decoded image (only valid if 0 is returned)
+     *  @param pLock an optional mutex to prevent multiple access to file operations
      *
      *  @returns
      *       0 on success
      *       1 on failure
      */
-    static int decode(const char* filename, Resolution res, ImageData_t* pDataOut);
+    static int decode(const char* filename, Resolution res, ImageData_t* pDataOut, Mutex* pLock=NULL);
     
 private: