X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ppm%2Ftrgt_ppm.cpp;h=14dba1d0c442304263431c8facf8970e65575453;hb=18baf4d4fe523d84ad741d7fde0f10a58d47587b;hp=5a6a0cdd9c59e90a862fedbb4848a6a3087bc1b0;hpb=675aca937d23c7f460edf42ac3ec0ffa06205a2c;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp b/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp
index 5a6a0cd..14dba1d 100644
--- a/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp
+++ b/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -34,7 +35,6 @@
 #endif
 
 #include "trgt_ppm.h"
-#include <synfig/synfig.h>
 #include <ETL/stringf>
 #include <cstdio>
 #include <algorithm>
@@ -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);
 	}
 
@@ -135,7 +132,7 @@ ppm::start_frame(synfig::ProgressCallback *callback)
 }
 
 Color *
-ppm::start_scanline(int scanline)
+ppm::start_scanline(int /*scanline*/)
 {
 	return color_buffer;
 }