From bf81f1d6d5acbcb4e9568b351ec3458c3ca270f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Tue, 1 Jan 2013 21:28:11 -0300 Subject: [PATCH] Changed std::vector for SafeDataPointer for internal FileSystem FileGet. --- projects/linux/ee.creator.user | 2 +- src/eepp/system/cpak.cpp | 4 ++-- src/eepp/system/czip.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/linux/ee.creator.user b/projects/linux/ee.creator.user index 333ed2581..535d426f4 100644 --- a/projects/linux/ee.creator.user +++ b/projects/linux/ee.creator.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/src/eepp/system/cpak.cpp b/src/eepp/system/cpak.cpp index 1679471b7..bd809a429 100755 --- a/src/eepp/system/cpak.cpp +++ b/src/eepp/system/cpak.cpp @@ -270,11 +270,11 @@ bool cPak::AddFile( const std::string& path, const std::string& inpack ) { if ( path.size() > 56 ) return false; - std::vector file; + SafeDataPointer file; FileSystem::FileGet( path, file ); - return AddFile( file, inpack ); + return AddFile( file.Data, file.DataSize, inpack ); } bool cPak::AddFiles( std::map paths ) { diff --git a/src/eepp/system/czip.cpp b/src/eepp/system/czip.cpp index 9e46aa9b9..f696b4bd3 100644 --- a/src/eepp/system/czip.cpp +++ b/src/eepp/system/czip.cpp @@ -69,11 +69,11 @@ bool cZip::Close() { } bool cZip::AddFile( const std::string& path, const std::string& inpack ) { - std::vector file; + SafeDataPointer file; FileSystem::FileGet( path, file ); - return AddFile( file, inpack ); + return AddFile( file.Data, file.DataSize, inpack ); } bool cZip::AddFile( const Uint8 * data, const Uint32& dataSize, const std::string& inpack ) {