projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give the text tool a name for the tooltip and 'state' menu. Let's call it... "Text...
[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
779b96a
..
e271110
100644
(file)
--- a/
synfig-core/trunk/src/synfig/importer.cpp
+++ b/
synfig-core/trunk/src/synfig/importer.cpp
@@
-2,10
+2,11
@@
/*! \file importer.cpp
** \brief writeme
**
/*! \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-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \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
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-88,7
+89,7
@@
Importer::open(const String &filename)
synfig::error(_("Importer::open(): Cannot open empty filename"));
return 0;
}
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))
// If we already have an importer open under that filename,
// then use it instead.
if(__open_importers->count(filename))
@@
-96,23
+97,24
@@
Importer::open(const String &filename)
//synfig::info("Found importer already open, using it...");
return (*__open_importers)[filename];
}
//synfig::info("Found importer already open, using it...");
return (*__open_importers)[filename];
}
-
- if(fi
nd(filename.begin(),filename.end(),'.')==filename.end()
)
+
+ if(fi
lename_extension(filename) == ""
)
{
synfig::error(_("Importer::open(): Couldn't find extension"));
return 0;
}
{
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);
std::transform(ext.begin(),ext.end(),ext.begin(),&::tolower);
-
-
+
+
if(!Importer::book().count(ext))
{
synfig::error(_("Importer::open(): Unknown file type -- ")+ext);
return 0;
}
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());
try {
Importer::Handle importer;
importer=Importer::book()[ext](filename.c_str());