projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid a warning from g++ 4.3.
[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
708ddd8
..
a130984
100644
(file)
--- a/
synfig-core/trunk/src/modules/lyr_std/import.cpp
+++ b/
synfig-core/trunk/src/modules/lyr_std/import.cpp
@@
-1,9
+1,12
@@
/* === S Y N F I G ========================================================= */
/*! \file import.cpp
/* === S Y N F I G ========================================================= */
/*! \file import.cpp
-** \brief Image Import Layer Implementation
+** \brief Implementation of the "Import Image" layer
+**
+** $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
@@
-52,10
+55,10
@@
using namespace etl;
SYNFIG_LAYER_INIT(Import);
SYNFIG_LAYER_SET_NAME(Import,"import");
SYNFIG_LAYER_INIT(Import);
SYNFIG_LAYER_SET_NAME(Import,"import");
-SYNFIG_LAYER_SET_LOCAL_NAME(Import,
_("Import
"));
-SYNFIG_LAYER_SET_CATEGORY(Import,_("Other"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Import,
N_("Import Image
"));
+SYNFIG_LAYER_SET_CATEGORY(Import,
N
_("Other"));
SYNFIG_LAYER_SET_VERSION(Import,"0.1");
SYNFIG_LAYER_SET_VERSION(Import,"0.1");
-SYNFIG_LAYER_SET_CVS_ID(Import,"$Id
: import.cpp,v 1.2 2005/03/19 04:26:42 darco Exp
$");
+SYNFIG_LAYER_SET_CVS_ID(Import,"$Id$");
/* === P R O C E D U R E S ================================================= */
/* === P R O C E D U R E S ================================================= */
@@
-81,7
+84,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())
{
@@
-96,7
+99,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," ");
}
@@
-141,7
+144,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;
@@
-149,7
+152,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()));