X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fimporter.cpp;h=e27111072336416038de8dc564504baafaa104ee;hb=b9a14d1642ddddb939a0f823ecd9089bb3e1fede;hp=6fb66cbe7d6e015d3a8755d6326bce366a3bbab1;hpb=e3acc0b267b14fda5db3c7bbb2f218b993ef84b3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/importer.cpp b/synfig-core/trunk/src/synfig/importer.cpp
index 6fb66cb..e271110 100644
--- a/synfig-core/trunk/src/synfig/importer.cpp
+++ b/synfig-core/trunk/src/synfig/importer.cpp
@@ -1,27 +1,29 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file importer.cpp
 **	\brief writeme
 **
-**	$Id: importer.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
 
 /* === H E A D E R S ======================================================= */
 
-#define SINFG_NO_ANGLE
+#define SYNFIG_NO_ANGLE
 
 #ifdef USING_PCH
 #	include "pch.h"
@@ -47,9 +49,9 @@
 
 using namespace etl;
 using namespace std;
-using namespace sinfg;
+using namespace synfig;
 
-Importer::Book* sinfg::Importer::book_;
+Importer::Book* synfig::Importer::book_;
 
 map<String,Importer::LooseHandle> *__open_importers;
 
@@ -84,34 +86,35 @@ Importer::open(const String &filename)
 {
 	if(filename.empty())
 	{
-		sinfg::error(_("Importer::open(): Cannot open empty filename"));
+		synfig::error(_("Importer::open(): Cannot open empty filename"));
 		return 0;
 	}
-	
+
 	// If we already have an importer open under that filename,
 	// then use it instead.
 	if(__open_importers->count(filename))
 	{
-		//sinfg::info("Found importer already open, using it...");
+		//synfig::info("Found importer already open, using it...");
 		return (*__open_importers)[filename];
 	}
-	
-	if(find(filename.begin(),filename.end(),'.')==filename.end())
+
+	if(filename_extension(filename) == "")
 	{
-		sinfg::error(_("Importer::open(): Couldn't find extension"));
+		synfig::error(_("Importer::open(): Couldn't find extension"));
 		return 0;
 	}
-		
-	String ext=string(filename.begin()+filename.find_last_of('.')+1,filename.end());
+
+	String ext(filename_extension(filename));
+	if (ext.size()) ext = ext.substr(1); // skip initial '.'
 	std::transform(ext.begin(),ext.end(),ext.begin(),&::tolower);
-	
-	
+
+
 	if(!Importer::book().count(ext))
 	{
-		sinfg::error(_("Importer::open(): Unknown file type -- ")+ext);
+		synfig::error(_("Importer::open(): Unknown file type -- ")+ext);
 		return 0;
 	}
-	
+
 	try {
 		Importer::Handle importer;
 		importer=Importer::book()[ext](filename.c_str());
@@ -120,7 +123,7 @@ Importer::open(const String &filename)
 	}
 	catch (String str)
 	{
-		sinfg::error(str);
+		synfig::error(str);
 	}
 	return 0;
 }