X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=blobdiff_plain;f=dali%2Fdevel-api%2Fadaptor-framework%2Ffile-loader.cpp;h=b63b5c7c4ad83f1fdf95a93c5fc696a4c72d1b4e;hp=9403781665a587b8b6bb2b8b933e7d1eb7ef7a2c;hb=97beeb72a4a0fe144dc88839a288140679902b2c;hpb=29139152a3b4efc58a3c8f7277368fb70e382748 diff --git a/dali/devel-api/adaptor-framework/file-loader.cpp b/dali/devel-api/adaptor-framework/file-loader.cpp index 9403781..b63b5c7 100644 --- a/dali/devel-api/adaptor-framework/file-loader.cpp +++ b/dali/devel-api/adaptor-framework/file-loader.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -17,10 +17,13 @@ // CLASS HEADER #include - +// EXTERNAL INCLUDES #include #include +// INTERNAL INCLUDES +#include + namespace Dali { @@ -29,60 +32,17 @@ namespace FileLoader int ReadFile(const std::string& filename, Dali::Vector & memblock, FileLoader::FileType fileType) { - std::streampos size; - - return ReadFile( filename, size, memblock, fileType); + return Dali::Internal::Adaptor::ReadFile( filename, memblock, fileType ); } -int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector & memblock, FileLoader::FileType fileType) +int ReadFile(const std::string& filename, std::streampos& fileSize, Dali::Vector& memblock, FileLoader::FileType fileType) { - int errorCode = 0; - std::ifstream * file; - - - if( fileType == BINARY ) - { - file = new std::ifstream (filename.c_str(), std::ios::in|std::ios::binary|std::ios::ate); - } - else if( fileType == TEXT ) - { - file = new std::ifstream (filename.c_str(), std::ios::in|std::ios::ate); - } - else - { - return errorCode; - } - - if( file->is_open() ) - { - fileSize = file->tellg(); - - memblock.Resize( fileSize ); - - file->seekg (0, std::ios::beg); - file->read( memblock.Begin(), fileSize ); - file->close(); - - delete file; - - errorCode = 1; - } - - return errorCode; + return Dali::Internal::Adaptor::ReadFile( filename, fileSize, memblock, fileType );; } - std::streampos GetFileSize(const std::string& filename) { - std::streampos size = 0; - - std::ifstream file (filename.c_str(), std::ios::in|std::ios::binary|std::ios::ate); - if( file.is_open() ) - { - size = file.tellg(); - file.close(); - } - return size; + return Dali::Internal::Adaptor::GetFileSize(filename); } } //FileLoader