X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_jpeg%2Ftrgt_jpeg.cpp;h=3ff854dcbb6825dbcc3f89e28192d25affb2b97a;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=6dd9f1156fa65dfcfc653e0c5a9e0d2f669f8379;hpb=70bcefce2ab011a11014f36fc129b473cc0bc61e;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 6dd9f11..3ff854d 100644
--- a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp
+++ b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp
@@ -2,8 +2,11 @@
 /*!	\file trgt_jpeg.cpp
 **	\brief jpeg_trgt Target Module
 **
+**	$Id$
+**
 **	\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
@@ -51,7 +54,7 @@ SYNFIG_TARGET_INIT(jpeg_trgt);
 SYNFIG_TARGET_SET_NAME(jpeg_trgt,"jpeg");
 SYNFIG_TARGET_SET_EXT(jpeg_trgt,"jpg");
 SYNFIG_TARGET_SET_VERSION(jpeg_trgt,"0.1");
-SYNFIG_TARGET_SET_CVS_ID(jpeg_trgt,"$Id: trgt_jpeg.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $");
+SYNFIG_TARGET_SET_CVS_ID(jpeg_trgt,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -107,18 +110,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);
 	}
 
@@ -178,7 +178,7 @@ jpeg_trgt::end_frame()
 }
 
 Color *
-jpeg_trgt::start_scanline(int scanline)
+jpeg_trgt::start_scanline(int /*scanline*/)
 {
 	return color_buffer;
 }