Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / modules / mod_ppm / trgt_ppm.cpp

diff --git a/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.cpp b/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.cpp
index 6484152..8fc4810 100644 (file)
--- a/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.cpp
+++ b/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.cpp
@@ -103,18 +103,15 @@ ppm::start_frame(synfig::ProgressCallback *callback)
        }
        else if(multi_image)
        {
-               String
-                       newfilename(filename),
-                       ext(find(filename.begin(),filename.end(),'.'),filename.end());
-               newfilename.erase(find(newfilename.begin(),newfilename.end(),'.'),newfilename.end());
-
-               newfilename+=etl::strprintf("%04d",imagecount)+ext;
-               file=SmartFILE(fopen(newfilename.c_str(),"wb"));
+               String newfilename(filename_sans_extension(filename) +
+                                                  etl::strprintf(".%04d",imagecount) +
+                                                  filename_extension(filename));
+               file=SmartFILE(fopen(newfilename.c_str(),POPEN_BINARY_WRITE_TYPE));
                if(callback)callback->task(newfilename);
        }
        else
        {
-               file=SmartFILE(fopen(filename.c_str(),"wb"));
+               file=SmartFILE(fopen(filename.c_str(),POPEN_BINARY_WRITE_TYPE));
                if(callback)callback->task(filename);
        }