Add uint8_t type ReadFile method

Change-Id: Ib7127b7c2a5550aeb71c2c7ad3bfba0a37cd0a56

diff --git a/dali/devel-api/adaptor-framework/file-loader.cpp b/dali/devel-api/adaptor-framework/file-loader.cpp
index e4a2030..340b875 100644 (file)
--- a/dali/devel-api/adaptor-framework/file-loader.cpp
+++ b/dali/devel-api/adaptor-framework/file-loader.cpp
@@ -41,6 +41,11 @@ int ReadFile(const std::string& filename, Dali::Vector<char>& memblock, FileLoad
   return Dali::Internal::Adaptor::ReadFile(filename, memblock, fileType);
 }
 
+int ReadFile(const std::string& filename, Dali::Vector<uint8_t>& memblock, FileLoader::FileType fileType)
+{
+  return Dali::Internal::Adaptor::ReadFile(filename, memblock, fileType);
+}
+
 int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector<char>& memblock, FileLoader::FileType fileType)
 {
   return Dali::Internal::Adaptor::ReadFile(filename, fileSize, memblock, fileType);

diff --git a/dali/devel-api/adaptor-framework/file-loader.h b/dali/devel-api/adaptor-framework/file-loader.h
index f05e854..8b1dd7c 100644 (file)
--- a/dali/devel-api/adaptor-framework/file-loader.h
+++ b/dali/devel-api/adaptor-framework/file-loader.h
@@ -54,6 +54,18 @@ DALI_ADAPTOR_API int ReadFile(const std::string& filename, Dali::Vector<char>& m
  * @brief Load the file. It will load it either as a binary or as a text
  *
  * @param[in] filename  Filename of the file to load.
+ * @param[in] memblock  Dali::Vector containing the buffer loaded
+ * @param[in] fileType  How we want to load the file. Binary or Text. Binary default
+ * @return error code. 0 - Error, 1 - Ok
+ *
+ *
+ */
+DALI_ADAPTOR_API int ReadFile(const std::string& filename, Dali::Vector<uint8_t>& memblock, FileLoader::FileType fileType = BINARY);
+
+/**
+ * @brief Load the file. It will load it either as a binary or as a text
+ *
+ * @param[in] filename  Filename of the file to load.
  * @param[in] fileSize  Size of the loaded file
  * @param[in] memblock  Dali::Vector containing the buffer loaded
  * @param[in] fileType  How we want to load the file. Binary or Text. Binary default

diff --git a/dali/internal/adaptor-framework/android/file-loader-impl-android.cpp b/dali/internal/adaptor-framework/android/file-loader-impl-android.cpp
index f0170e3..06abd6a 100644 (file)
--- a/dali/internal/adaptor-framework/android/file-loader-impl-android.cpp
+++ b/dali/internal/adaptor-framework/android/file-loader-impl-android.cpp
@@ -43,6 +43,13 @@ int ReadFile(const std::string& filename, Dali::Vector<char>& memblock, Dali::Fi
   return Dali::Internal::Adaptor::ReadFile( filename, size, memblock, fileType);
 }
 
+int ReadFile(const std::string& filename, Dali::Vector<uint8_t>& memblock, Dali::FileLoader::FileType fileType)
+{
+  std::streampos size;
+
+  return Dali::Internal::Adaptor::ReadFile( filename, size, memblock, fileType);
+}
+
 inline bool hasPrefix(const std::string& prefix, const std::string& path)
 {
   return std::mismatch(prefix.begin(), prefix.end(), path.begin()).first == prefix.end();
@@ -61,7 +68,8 @@ inline std::string ConvertToAssetsInternalPath(const std::string& path, int offs
   return internalPath;
 }
 
-int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector<char>& memblock, Dali::FileLoader::FileType fileType)
+template<typename T>
+int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector<T>& memblock, Dali::FileLoader::FileType fileType)
 {
   int errorCode = 0;
   int length = 0;
@@ -87,7 +95,7 @@ int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector
       length = AAsset_getLength( asset );
       memblock.Resize( length + 1 ); // 1 for extra zero at the end
 
-      char* buffer = &memblock[0];
+      char* buffer = reinterpret_cast<char*>(memblock.Begin());
       errorCode = ( AAsset_read( asset, buffer, length ) != length ) ? 0 : 1;
       fileSize = length;
 
@@ -110,7 +118,7 @@ int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector
       //put last byte as 0, in case this is a text file without null-terminator
       memblock[length] = 0;
 
-      char* buffer = &memblock[0];
+      char* buffer = reinterpret_cast<char*>(memblock.Begin());
       fseek( file, 0, SEEK_SET );
       errorCode = ( fread( buffer, 1, length, file ) != length ) ? 0 : 1;
       fileSize = length;

diff --git a/dali/internal/adaptor-framework/common/file-loader-impl.h b/dali/internal/adaptor-framework/common/file-loader-impl.h
index 8319716..96199a1 100644 (file)
--- a/dali/internal/adaptor-framework/common/file-loader-impl.h
+++ b/dali/internal/adaptor-framework/common/file-loader-impl.h
@@ -33,7 +33,10 @@ namespace Adaptor
 
 int ReadFile(const std::string& filename, Dali::Vector<char>& memblock, Dali::FileLoader::FileType fileType = Dali::FileLoader::BINARY);
 
-int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector<char>& memblock, Dali::FileLoader::FileType fileType = Dali::FileLoader::BINARY);
+int ReadFile(const std::string& filename, Dali::Vector<uint8_t>& memblock, Dali::FileLoader::FileType fileType = Dali::FileLoader::BINARY);
+
+template<typename T>
+int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector<T>& memblock, Dali::FileLoader::FileType fileType = Dali::FileLoader::BINARY);
 
 std::streampos GetFileSize(const std::string& filename);
 

diff --git a/dali/internal/adaptor-framework/generic/file-loader-impl-generic.cpp b/dali/internal/adaptor-framework/generic/file-loader-impl-generic.cpp
index 31302ef..f81d01f 100644 (file)
--- a/dali/internal/adaptor-framework/generic/file-loader-impl-generic.cpp
+++ b/dali/internal/adaptor-framework/generic/file-loader-impl-generic.cpp
@@ -32,14 +32,22 @@ namespace Internal
 namespace Adaptor
 {
 
-int ReadFile(const std::string& filename, Dali::Vector<char> & memblock, Dali::FileLoader::FileType fileType)
+int ReadFile(const std::string& filename, Dali::Vector<char>& memblock, Dali::FileLoader::FileType fileType)
 {
   std::streampos size;
 
   return Dali::Internal::Adaptor::ReadFile( filename, size, memblock, fileType);
 }
 
-int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector<char> & memblock, Dali::FileLoader::FileType fileType)
+int ReadFile(const std::string& filename, Dali::Vector<uint8_t>& memblock, Dali::FileLoader::FileType fileType)
+{
+  std::streampos size;
+
+  return Dali::Internal::Adaptor::ReadFile(filename, size, memblock, fileType);
+}
+
+template<typename T>
+int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector<T>& memblock, Dali::FileLoader::FileType fileType)
 {
   int errorCode = 0;
   std::ifstream * file;
@@ -64,7 +72,7 @@ int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector
     memblock.Resize( fileSize );
 
     file->seekg (0, std::ios::beg);
-    file->read( memblock.Begin(), fileSize );
+    file->read( reinterpret_cast<char*>(memblock.Begin()), fileSize );
     file->close();
 
     delete file;