diff options
author | Oz Linden <oz@lindenlab.com> | 2015-04-07 17:59:28 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2015-04-07 17:59:28 -0400 |
commit | 8b42c7898ef756a4a81daa08b2a5acce2894f4b8 (patch) | |
tree | 57011bc24cc27df7b436c1edda7957ac3530fa57 /indra/llimage | |
parent | 3a57b18896eacb6fea6680d0eccaaeddb0b700b0 (diff) |
replace llifstream and llofstream with std::ifstream and std::ofstream respectively
Diffstat (limited to 'indra/llimage')
-rwxr-xr-x | indra/llimage/llimage.cpp | 4 | ||||
-rwxr-xr-x | indra/llimage/llimagefilter.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/llimage/llimage.cpp b/indra/llimage/llimage.cpp index 16df27bb8e..ef92395d6d 100755 --- a/indra/llimage/llimage.cpp +++ b/indra/llimage/llimage.cpp @@ -1172,7 +1172,7 @@ static std::string find_file(std::string &name, S8 *codec) for (int i=0; i<(int)(NUM_FILE_EXTENSIONS); i++) { tname = name + "." + std::string(file_extensions[i].exten); - llifstream ifs(tname.c_str(), llifstream::binary); + std::ifstream ifs(tname.c_str(), std::ifstream::binary); if (ifs.is_open()) { ifs.close(); @@ -1219,7 +1219,7 @@ bool LLImageRaw::createFromFile(const std::string &filename, bool j2c_lowest_mip return false; // format not recognized } - llifstream ifs(name.c_str(), llifstream::binary); + std::ifstream ifs(name.c_str(), std::ifstream::binary); if (!ifs.is_open()) { // SJB: changed from LL_INFOS() to LL_DEBUGS() to reduce spam diff --git a/indra/llimage/llimagefilter.cpp b/indra/llimage/llimagefilter.cpp index 41adc7be9a..92fbc8ad73 100755 --- a/indra/llimage/llimagefilter.cpp +++ b/indra/llimage/llimagefilter.cpp @@ -54,7 +54,7 @@ LLImageFilter::LLImageFilter(const std::string& file_path) : mStencilMax(1.0) { // Load filter description from file - llifstream filter_xml(file_path.c_str()); + std::ifstream filter_xml(file_path.c_str()); if (filter_xml.is_open()) { // Load and parse the file |