projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Since the last change will require a recompilation of pretty much everything, I took...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
lyr_std
/
import.cpp
diff --git
a/synfig-core/trunk/src/modules/lyr_std/import.cpp
b/synfig-core/trunk/src/modules/lyr_std/import.cpp
index
2af6a4d
..
536513e
100644
(file)
--- a/
synfig-core/trunk/src/modules/lyr_std/import.cpp
+++ b/
synfig-core/trunk/src/modules/lyr_std/import.cpp
@@
-83,7
+83,7
@@
Import::set_param(const String & param, const ValueBase &value)
{
try{
IMPORT(time_offset);
{
try{
IMPORT(time_offset);
- if(param=="filename" && value.same_as(filename))
+ if(param=="filename" && value.same_
type_
as(filename))
{
if(!get_canvas())
{
{
if(!get_canvas())
{
@@
-98,7
+98,7
@@
Import::set_param(const String & param, const ValueBase &value)
// Get rid of any %20 crap
{
// Get rid of any %20 crap
{
-
unsigned int
n;
+
String::size_type
n;
while((n=newfilename.find("%20"))!=String::npos)
newfilename.replace(n,3," ");
}
while((n=newfilename.find("%20"))!=String::npos)
newfilename.replace(n,3," ");
}
@@
-143,7
+143,7
@@
Import::set_param(const String & param, const ValueBase &value)
if(is_absolute_path(newfilename))
filename_with_path=newfilename;
else
if(is_absolute_path(newfilename))
filename_with_path=newfilename;
else
- filename_with_path=get_canvas()->get_file_path()+ETL_DIRECTORY_SEP
E
RATOR+newfilename;
+ filename_with_path=get_canvas()->get_file_path()+ETL_DIRECTORY_SEP
A
RATOR+newfilename;
handle<Importer> newimporter;
handle<Importer> newimporter;
@@
-151,7
+151,7
@@
Import::set_param(const String & param, const ValueBase &value)
if(!newimporter)
{
if(!newimporter)
{
- newimporter=Importer::open(get_canvas()->get_file_path()+ETL_DIRECTORY_SEP
E
RATOR+basename(newfilename));
+ newimporter=Importer::open(get_canvas()->get_file_path()+ETL_DIRECTORY_SEP
A
RATOR+basename(newfilename));
if(!newimporter)
{
synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));
if(!newimporter)
{
synfig::error(strprintf("Unable to create an importer object with file \"%s\"",filename_with_path.c_str()));