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=5e164c1d939466efb81b45098bd1535c87817363;hpb=cc54c38609ee9745ad678e5e9b9d7d2912be9c95;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 5e164c1..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>
@@ -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
 	{