X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_openexr%2Ftrgt_openexr.cpp;h=ccfa5768d333d3712faa24d958cb22901cb4f27d;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=2a2932e295fb799a4b14a8c552b1e7f340f84aba;hpb=70bcefce2ab011a11014f36fc129b473cc0bc61e;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp b/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp
index 2a2932e..ccfa576 100644
--- a/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp
+++ b/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp
@@ -2,8 +2,11 @@
 /*!	\file trgt_openexr.cpp
 **	\brief exr_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
@@ -32,7 +35,6 @@
 #endif
 
 #include "trgt_openexr.h"
-#include <synfig/synfig.h>
 #include <ETL/stringf>
 #include <cstdio>
 #include <algorithm>
@@ -51,7 +53,7 @@ SYNFIG_TARGET_INIT(exr_trgt);
 SYNFIG_TARGET_SET_NAME(exr_trgt,"openexr");
 SYNFIG_TARGET_SET_EXT(exr_trgt,"exr");
 SYNFIG_TARGET_SET_VERSION(exr_trgt,"1.0.4");
-SYNFIG_TARGET_SET_CVS_ID(exr_trgt,"$Id: trgt_openexr.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_TARGET_SET_CVS_ID(exr_trgt,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -111,14 +113,10 @@ exr_trgt::start_frame(synfig::ProgressCallback *cb)
 		delete exr_file;
 	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;
-		frame_name=newfilename;
-		if(cb)cb->task(newfilename);
+		frame_name = (filename_sans_extension(filename) +
+					  etl::strprintf(".%04d",imagecount) +
+					  filename_extension(filename));
+		if(cb)cb->task(frame_name);
 	}
 	else
 	{