X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_jpeg%2Ftrgt_jpeg.cpp;h=7532fe5da006a231a60578987af0fd293f92dd65;hb=bb3d7752024191d641932add1df2add4c34fc83c;hp=c0c116cfe7ec7d8f6319349b0e263f4362379911;hpb=675aca937d23c7f460edf42ac3ec0ffa06205a2c;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp
index c0c116c..7532fe5 100644
--- a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp
@@ -109,18 +109,15 @@ jpeg_trgt::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=fopen(newfilename.c_str(),"wb");
+		String newfilename(filename_sans_extension(filename) +
+						   etl::strprintf(".%04d",imagecount) +
+						   filename_extension(filename));
+		file=fopen(newfilename.c_str(),POPEN_BINARY_WRITE_TYPE);
 		if(callback)callback->task(newfilename);
 	}
 	else
 	{
-		file=fopen(filename.c_str(),"wb");
+		file=fopen(filename.c_str(),POPEN_BINARY_WRITE_TYPE);
 		if(callback)callback->task(filename);
 	}
 
@@ -180,7 +177,7 @@ jpeg_trgt::end_frame()
 }
 
 Color *
-jpeg_trgt::start_scanline(int scanline)
+jpeg_trgt::start_scanline(int /*scanline*/)
 {
 	return color_buffer;
 }