Added my "Copyright (c) 2007" notices, for files I edited in 2007.

[synfig.git] / synfig-core / trunk / src / synfig / importer.cpp

diff --git a/synfig-core/trunk/src/synfig/importer.cpp b/synfig-core/trunk/src/synfig/importer.cpp
index 787c1ea..e271110 100644 (file)
--- a/synfig-core/trunk/src/synfig/importer.cpp
+++ b/synfig-core/trunk/src/synfig/importer.cpp
@@ -2,19 +2,21 @@
 /*!    \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
 */
 /* ========================================================================= */
@@ -87,7 +89,7 @@ Importer::open(const String &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))
@@ -95,23 +97,24 @@ Importer::open(const String &filename)
                //synfig::info("Found importer already open, using it...");
                return (*__open_importers)[filename];
        }
-       
-       if(find(filename.begin(),filename.end(),'.')==filename.end())
+
+       if(filename_extension(filename) == "")
        {
                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))
        {
                synfig::error(_("Importer::open(): Unknown file type -- ")+ext);
                return 0;
        }
-       
+
        try {
                Importer::Handle importer;
                importer=Importer::book()[ext](filename.c_str());