X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_imagemagick%2Fmptr_imagemagick.cpp;fp=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_imagemagick%2Fmptr_imagemagick.cpp;h=8e35ac9d2faa0e9999a7f568a2f3dc5e460a01dd;hb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;hp=439eeddb5916569d165d283faff1d94e4f3506dc;hpb=cee5940bae97612105db8b7e1ffcf513f9d9150c;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
index 439eedd..8e35ac9 100644
--- a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
+++ b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
@@ -86,19 +86,19 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::Progress
 		return false;
 	}
 	string temp_file="/tmp/deleteme.png";
-	
+
 	if(filename.find("psd")!=String::npos)
 		command=strprintf("convert \"%s\" -flatten \"png32:%s\"\n",filename.c_str(),temp_file.c_str());
 	else
 		command=strprintf("convert \"%s\" \"png32:%s\"\n",filename.c_str(),temp_file.c_str());
-	
+
 	synfig::info("command=%s",command.c_str());
-	
+
 	if(system(command.c_str())!=0)
 		return false;
 
 	Importer::Handle importer(Importer::open(temp_file));
-	
+
 	DEBUGPOINT();
 
 	if(!importer)
@@ -107,7 +107,7 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::Progress
 		else synfig::error(_("Unable to open ")+temp_file);
 		return false;
 	}
-	
+
 	DEBUGPOINT();
 
 	if(!importer->get_frame(surface,0,cb))
@@ -116,12 +116,12 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::Progress
 		else synfig::error(_("Unable to get frame from ")+temp_file);
 		return false;
 	}
-	
+
 	if(!surface)
 	{
 		if(cb)cb->error(_("Bad surface from ")+temp_file);
 		else synfig::error(_("Bad surface from ")+temp_file);
-		return false;		
+		return false;
 	}
 
 	if(1)
@@ -149,12 +149,12 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::Progress
 
 	Surface bleh(surface);
 	surface=bleh;
-	
+
 
 	//remove(temp_file.c_str());
 	DEBUGPOINT();
 	return true;
-	
+
 #else
 	if(file)
 		pclose(file);
@@ -244,6 +244,6 @@ imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::Progress
 
 	return true;
 #endif
-		
-	
+
+
 }