X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=builder%2Fdali-builder.cpp;h=5445fd1953aa8ad5826ab7ef003c83b21b75f24d;hb=3d56a1c9e87859d65065e9359e63dc730fb9eecb;hp=ac2b1dfdaaa8777765fa44314aaef794d82b4a0c;hpb=46e6a0e92784c860b2b5425e34941c6574dd8062;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/builder/dali-builder.cpp b/builder/dali-builder.cpp index ac2b1df..5445fd1 100644 --- a/builder/dali-builder.cpp +++ b/builder/dali-builder.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ //------------------------------------------------------------------------------ #include +#include #include #include #include @@ -102,10 +103,16 @@ private: std::time_t mLastTime; std::string mstringPath; - std::string GetFileContents(const std::string &fn) + std::string GetFileContents(const std::string &filename) { - std::ifstream t(fn.c_str()); - return std::string((std::istreambuf_iterator(t)), std::istreambuf_iterator()); + std::streampos bufferSize = 0; + Dali::Vector fileBuffer; + if( !Dali::FileLoader::ReadFile( filename, bufferSize, fileBuffer, FileLoader::FileType::BINARY ) ) + { + return std::string(); + } + + return std::string( &fileBuffer[0], bufferSize ); }; }; @@ -295,7 +302,7 @@ private: // // //------------------------------------------------------------------------------ -int main(int argc, char **argv) +int DALI_EXPORT_API main(int argc, char **argv) { Application dali_app = Application::New(&argc, &argv, DEMO_THEME_PATH);