projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidying.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
tool
/
main.cpp
diff --git
a/synfig-core/trunk/src/tool/main.cpp
b/synfig-core/trunk/src/tool/main.cpp
index
90d7cf8
..
701bd67
100644
(file)
--- a/
synfig-core/trunk/src/tool/main.cpp
+++ b/
synfig-core/trunk/src/tool/main.cpp
@@
-1174,12
+1174,19
@@
int main(int argc, char *argv[])
return ret;
// Open the composition
return ret;
// Open the composition
- String errors;
- job_list.front().root=open_canvas(job_list.front().filename, errors);
+ String errors, warnings;
+ try
+ {
+ job_list.front().root=open_canvas(job_list.front().filename, errors, warnings);
+ }
+ catch(runtime_error x)
+ {
+ job_list.front().root = 0;
+ }
if(!job_list.front().root)
{
if(!job_list.front().root)
{
- cerr<<_("Unable to
open ")<<job_list.front().filename<<"
."<<endl;
+ cerr<<_("Unable to
load '")<<job_list.front().filename<<"'
."<<endl;
cerr<<_("Throwing out job...")<<endl;
job_list.pop_front();
continue;
cerr<<_("Throwing out job...")<<endl;
job_list.pop_front();
continue;
@@
-1199,7
+1206,8
@@
int main(int argc, char *argv[])
{
try
{
{
try
{
- job_list.front().canvas=job_list.front().root->find_canvas(canvasid);
+ String warnings;
+ job_list.front().canvas=job_list.front().root->find_canvas(canvasid, warnings);
}
catch(Exception::IDNotFound)
{
}
catch(Exception::IDNotFound)
{
@@
-1235,10
+1243,13
@@
int main(int argc, char *argv[])
extract_append(imageargs,composite_file);
if(!composite_file.empty())
{
extract_append(imageargs,composite_file);
if(!composite_file.empty())
{
- String errors;
- Canvas::Handle composite(open_canvas(composite_file, errors));
+ String errors
, warnings
;
+ Canvas::Handle composite(open_canvas(composite_file, errors
, warnings
));
if(!composite)
if(!composite)
+ {
+ cerr<<_("Unable to append '")<<composite_file<<"'."<<endl;
break;
break;
+ }
Canvas::reverse_iterator iter;
for(iter=composite->rbegin();iter!=composite->rend();++iter)
{
Canvas::reverse_iterator iter;
for(iter=composite->rbegin();iter!=composite->rend();++iter)
{