#include <synfig/paramdesc.h>
#include <synfig/main.h>
#include <synfig/guid.h>
+#include <autorevision.h>
#endif
using namespace std;
int quality;
bool sifout;
+ bool list_canvases;
+
+ bool canvas_info, canvas_info_all, canvas_info_time_start, canvas_info_time_end, canvas_info_frame_rate,
+ canvas_info_frame_start, canvas_info_frame_end, canvas_info_w, canvas_info_h, canvas_info_image_aspect,
+ canvas_info_pw, canvas_info_ph, canvas_info_pixel_aspect, canvas_info_tl, canvas_info_br,
+ canvas_info_physical_w, canvas_info_physical_h, canvas_info_x_res, canvas_info_y_res, canvas_info_span,
+ canvas_info_interlaced, canvas_info_antialias, canvas_info_clamp, canvas_info_flags, canvas_info_focus,
+ canvas_info_bg_color, canvas_info_metadata;
+
+ Job()
+ {
+ canvas_info = canvas_info_all = canvas_info_time_start = canvas_info_time_end = canvas_info_frame_rate = canvas_info_frame_start = canvas_info_frame_end = canvas_info_w = canvas_info_h = canvas_info_image_aspect = canvas_info_pw = canvas_info_ph = canvas_info_pixel_aspect = canvas_info_tl = canvas_info_br = canvas_info_physical_w = canvas_info_physical_h = canvas_info_x_res = canvas_info_y_res = canvas_info_span = canvas_info_interlaced = canvas_info_antialias = canvas_info_clamp = canvas_info_flags = canvas_info_focus = canvas_info_bg_color = canvas_info_metadata = false;
+ };
};
typedef list<String> arg_list_t;
{
cout<<"GUID Test"<<endl;
for(int i=20;i;i--)
- {
cout<<synfig::GUID().get_string()<<' '<<synfig::GUID().get_string()<<endl;
- }
}
void signal_test_func()
/* === P R O C E D U R E S ================================================= */
-void display_help(int amount)
+void display_help_option(const char *flag, const char *arg, string description)
{
- class Argument
- {
- public:
- Argument(const char *flag,const char *arg, string description)
- {
- const char spaces[]=" ";
- if(arg)
- cerr<<strprintf(" %s %s %s",flag, arg, spaces+strlen(arg)+strlen(flag)+1)+description<<endl;
- else
- cerr<<strprintf(" %s %s",flag,spaces+strlen(flag))+description<<endl;
- }
- };
+ const char spaces[]=" ";
+ if(arg)
+ cerr << strprintf(" %s %s %s", flag, arg, spaces+strlen(arg)+strlen(flag)+1)+description << endl;
+ else
+ cerr << strprintf(" %s %s", flag, spaces+strlen(flag))+description << endl;
+}
+void display_help(bool full)
+{
cerr << endl << _("syntax: ") << progname << " [DEFAULT OPTIONS] ([SIF FILE] [SPECIFIC OPTIONS])..." << endl << endl;
- if(amount == 0)
- Argument("--help",NULL,_("Print out usage and syntax info"));
- else
+ if(full)
{
- Argument("-t","<output type>",_("Specify output target (Default:unknown)"));
- Argument("-w","<pixel width>",_("Set the image width (Use zero for file default)"));
- Argument("-h","<pixel height>",_("Set the image height (Use zero for file default)"));
- Argument("-s","<image dist>",_("Set the diagonal size of image window (Span)"));
- Argument("-a","<1...30>",_("Set antialias amount for parametric renderer."));
- Argument("-Q","<0...10>",strprintf(_("Specify image quality for accelerated renderer (default=%d)"),DEFAULT_QUALITY).c_str());
- Argument("-g","<amount>",_("Gamma (default=2.2)"));
- Argument("-v",NULL,_("Verbose Output (add more for more verbosity)"));
- Argument("-q",NULL,_("Quiet mode (No progress/time-remaining display)"));
- Argument("-c","<canvas id>",_("Render the canvas with the given id instead of the root."));
- Argument("-o","<output file>",_("Specify output filename"));
- Argument("-T","<# of threads>",_("Enable multithreaded renderer using specified # of threads"));
- Argument("-b",NULL,_("Print Benchmarks"));
- Argument("--fps","<framerate>",_("Set the frame rate"));
- Argument("--time","<time>",_("Render a single frame at <seconds>"));
- Argument("--begin-time","<time>",_("Set the starting time"));
- Argument("--end-time","<time>",_("Set the ending time"));
- Argument("--dpi","<res>",_("Set the dots-per-inch"));
- Argument("--append","<filename>",_("Append layers in <filename> to composition"));
- Argument("--layer-info","<layer>",_("Print out layer's description, parameter info, etc."));
- Argument("--layers",NULL,_("Print out the list of available layers"));
- Argument("--targets",NULL,_("Print out the list of available targets"));
- Argument("--importers",NULL,_("Print out the list of available importers"));
- Argument("--valuenodes",NULL,_("Print out the list of available ValueNodes"));
- Argument("--modules",NULL,_("Print out the list of loaded modules"));
- Argument("--version",NULL,_("Print out version information"));
- Argument("--info",NULL,_("Print out misc build information"));
- Argument("--license",NULL,_("Print out license information"));
+ display_help_option("-t", "<output type>", _("Specify output target (Default:unknown)"));
+ display_help_option("-w", "<pixel width>", _("Set the image width (Use zero for file default)"));
+ display_help_option("-h", "<pixel height>", _("Set the image height (Use zero for file default)"));
+ display_help_option("-s", "<image dist>", _("Set the diagonal size of image window (Span)"));
+ display_help_option("-a", "<1...30>", _("Set antialias amount for parametric renderer."));
+ display_help_option("-Q", "<0...10>", strprintf(_("Specify image quality for accelerated renderer (default=%d)"), DEFAULT_QUALITY).c_str());
+ display_help_option("-g", "<amount>", _("Gamma (default=2.2)"));
+ display_help_option("-v", NULL, _("Verbose Output (add more for more verbosity)"));
+ display_help_option("-q", NULL, _("Quiet mode (No progress/time-remaining display)"));
+ display_help_option("-c", "<canvas id>", _("Render the canvas with the given id instead of the root."));
+ display_help_option("-o", "<output file>", _("Specify output filename"));
+ display_help_option("-T", "<# of threads>", _("Enable multithreaded renderer using specified # of threads"));
+ display_help_option("-b", NULL, _("Print Benchmarks"));
+ display_help_option("--fps", "<framerate>", _("Set the frame rate"));
+ display_help_option("--time", "<time>", _("Render a single frame at <seconds>"));
+ display_help_option("--begin-time", "<time>", _("Set the starting time"));
+ display_help_option("--start-time", "<time>", _("Set the starting time"));
+ display_help_option("--end-time", "<time>", _("Set the ending time"));
+ display_help_option("--dpi", "<res>", _("Set the physical resolution (dots-per-inch)"));
+ display_help_option("--dpi-x", "<res>", _("Set the physical X resolution (dots-per-inch)"));
+ display_help_option("--dpi-y", "<res>", _("Set the physical Y resolution (dots-per-inch)"));
+
+ display_help_option("--list-canvases", NULL, _("List the exported canvases in the composition"));
+ display_help_option("--canvas-info", "<fields>", _("Print out specified details of the root canvas"));
+ display_help_option("--append", "<filename>", _("Append layers in <filename> to composition"));
+
+ display_help_option("--layer-info", "<layer>", _("Print out layer's description, parameter info, etc."));
+ display_help_option("--layers", NULL, _("Print out the list of available layers"));
+ display_help_option("--targets", NULL, _("Print out the list of available targets"));
+ display_help_option("--importers", NULL, _("Print out the list of available importers"));
+ display_help_option("--valuenodes", NULL, _("Print out the list of available ValueNodes"));
+ display_help_option("--modules", NULL, _("Print out the list of loaded modules"));
+ display_help_option("--version", NULL, _("Print out version information"));
+ display_help_option("--info", NULL, _("Print out misc build information"));
+ display_help_option("--license", NULL, _("Print out license information"));
#ifdef _DEBUG
- Argument("--guid-test",NULL,_("Test GUID generation"));
- Argument("--signal-test",NULL,_("Test signal implementation"));
+ display_help_option("--guid-test", NULL, _("Test GUID generation"));
+ display_help_option("--signal-test", NULL, _("Test signal implementation"));
#endif
}
+ else
+ display_help_option("--help", NULL, _("Print out usage and syntax info"));
- cerr<<endl;
+ cerr << endl;
}
int process_global_flags(arg_list_t &arg_list)
if(*iter == "--help")
{
- display_help(1);
+ display_help(true);
return SYNFIGTOOL_HELP;
}
if(*iter == "--info")
{
cout<<PACKAGE"-"VERSION<<endl;
- cout<<"Compiled on "__DATE__ " at "__TIME__;
+ #ifdef DEVEL_VERSION
+ cout<<endl<<DEVEL_VERSION<<endl<<endl;
+ #endif
+ cout<<"Compiled on "__DATE__ /* " at "__TIME__ */;
#ifdef __GNUC__
cout<<" with GCC "<<__VERSION__;
#endif
#ifdef __TCPLUSPLUS__
cout<<" with Borland Turbo C++ "<<(__TCPLUSPLUS__>>8)<<'.'<<((__TCPLUSPLUS__&255)>>4)<<'.'<<(__TCPLUSPLUS__&15);
#endif
-
cout<<endl<<SYNFIG_COPYRIGHT<<endl;
cout<<endl;
return SYNFIGTOOL_HELP;
synfig::Main synfig_main(dirname(progname),&p);
synfig::Layer::Book::iterator iter=synfig::Layer::book().begin();
for(;iter!=synfig::Layer::book().end();iter++)
- cout<<iter->first<<endl;
+ if (iter->second.category != CATEGORY_DO_NOT_USE)
+ cout<<iter->first<<endl;
return SYNFIGTOOL_HELP;
}
Progress p(PACKAGE);
synfig::Main synfig_main(dirname(progname),&p);
iter=next++;
+ if (iter==arg_list.end())
+ {
+ error("The `%s' flag requires a value. Use --help for a list of options.", "--layer-info");
+ return SYNFIGTOOL_MISSINGARGUMENT;
+ }
Layer::Handle layer=synfig::Layer::create(*iter);
cout<<"Layer Name: "<<layer->get_name()<<endl;
cout<<"Localized Layer Name: "<<layer->get_local_name()<<endl;
}
/* true if the given flag takes an extra parameter */
-bool flag_requires_value(String flag) {
- return (flag=="-a" || flag=="-c" || flag=="-g" || flag=="-h" || flag=="-o" ||
- flag=="-Q" || flag=="-s" || flag=="-t" || flag=="-T" || flag=="-w" ||
- flag=="--append" || flag=="--begin-time" || flag=="--dpi" || flag=="--dpi-x" ||
- flag=="--dpi-y" || flag=="--end-frame" || flag=="--end-time" || flag=="--fps" ||
- flag=="--frame" || flag=="--start-frame" || flag=="--start-time" || flag=="--time" );
+bool flag_requires_value(String flag)
+{
+ return (flag=="-a" || flag=="-c" || flag=="-g" || flag=="-h" || flag=="-o" ||
+ flag=="-Q" || flag=="-s" || flag=="-t" || flag=="-T" || flag=="-w" ||
+ flag=="--append" || flag=="--begin-time" || flag=="--canvas-info"|| flag=="--dpi" || flag=="--dpi-x" ||
+ flag=="--dpi-y" || flag=="--end-time" || flag=="--fps" || flag=="--layer-info" || flag=="--start-time" ||
+ flag=="--time" );
}
int extract_arg_cluster(arg_list_t &arg_list,arg_list_t &cluster)
cluster.push_back(*iter);
arg_list.erase(iter);
iter=next++;
- if (iter==arg_list.end()) {
+ if (iter==arg_list.end())
+ {
error("The `%s' flag requires a value. Use --help for a list of options.", cluster.back().c_str());
return SYNFIGTOOL_MISSINGARGUMENT;
}
else if (flag_requires_value(*iter))
iter=next++;
}
- if(w&&h)
+ if (w||h)
{
+ if (!w)
+ w = desc.get_w() * h / desc.get_h();
+ else if (!h)
+ h = desc.get_h() * w / desc.get_w();
+
desc.set_wh(w,h);
VERBOSE_OUT(1)<<strprintf(_("Resolution set to %dx%d"),w,h)<<endl;
}
- else
- {
- if(w)
- {
- VERBOSE_OUT(1)<<strprintf(_("Width set to %d pixels"),w)<<endl;
- desc.set_w(w);
- }
- if(h)
- {
- VERBOSE_OUT(1)<<strprintf(_("Height set to %d pixels"),h)<<endl;
- desc.set_h(h);
- }
- }
if(span)
desc.set_span(span);
return SYNFIGTOOL_OK;
return SYNFIGTOOL_OK;
}
+int extract_list_canvases(arg_list_t &arg_list,bool &list_canvases)
+{
+ arg_list_t::iterator iter, next;
+
+ for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
+ if(*iter=="--list-canvases")
+ {
+ list_canvases = true;
+ arg_list.erase(iter);
+ }
+
+ return SYNFIGTOOL_OK;
+}
+
+void extract_canvas_info(arg_list_t &arg_list, Job &job)
+{
+ arg_list_t::iterator iter, next;
+
+ for(next=arg_list.begin(),iter=next++;iter!=arg_list.end();iter=next++)
+ if(*iter=="--canvas-info")
+ {
+ job.canvas_info = true;
+ arg_list.erase(iter);
+ iter=next++;
+ String values(*iter), value;
+ arg_list.erase(iter);
+
+ std::string::size_type pos;
+ while (!values.empty())
+ {
+ pos = values.find_first_of(',');
+ if (pos == std::string::npos)
+ {
+ value = values;
+ values = "";
+ }
+ else
+ {
+ value = values.substr(0, pos);
+ values = values.substr(pos+1);
+ }
+ if (value == "all")
+ {
+ job.canvas_info_all = true;
+ return;
+ }
+
+ if (value == "time_start") job.canvas_info_time_start = true;
+ else if (value == "time_end") job.canvas_info_time_end = true;
+ else if (value == "frame_rate") job.canvas_info_frame_rate = true;
+ else if (value == "frame_start") job.canvas_info_frame_start = true;
+ else if (value == "frame_end") job.canvas_info_frame_end = true;
+ else if (value == "w") job.canvas_info_w = true;
+ else if (value == "h") job.canvas_info_h = true;
+ else if (value == "image_aspect") job.canvas_info_image_aspect = true;
+ else if (value == "pw") job.canvas_info_pw = true;
+ else if (value == "ph") job.canvas_info_ph = true;
+ else if (value == "pixel_aspect") job.canvas_info_pixel_aspect = true;
+ else if (value == "tl") job.canvas_info_tl = true;
+ else if (value == "br") job.canvas_info_br = true;
+ else if (value == "physical_w") job.canvas_info_physical_w = true;
+ else if (value == "physical_h") job.canvas_info_physical_h = true;
+ else if (value == "x_res") job.canvas_info_x_res = true;
+ else if (value == "y_res") job.canvas_info_y_res = true;
+ else if (value == "span") job.canvas_info_span = true;
+ else if (value == "interlaced") job.canvas_info_interlaced = true;
+ else if (value == "antialias") job.canvas_info_antialias = true;
+ else if (value == "clamp") job.canvas_info_clamp = true;
+ else if (value == "flags") job.canvas_info_flags = true;
+ else if (value == "focus") job.canvas_info_focus = true;
+ else if (value == "bg_color") job.canvas_info_bg_color = true;
+ else if (value == "metadata") job.canvas_info_metadata = true;
+ else
+ {
+ cerr<<_("Unrecognised canvas variable: ") << "'" << value << "'" << endl;
+ cerr<<_("Recognized variables are:") << endl <<
+ " all, time_start, time_end, frame_rate, frame_start, frame_end, w, h," << endl <<
+ " image_aspect, pw, ph, pixel_aspect, tl, br, physical_w, physical_h," << endl <<
+ " x_res, y_res, span, interlaced, antialias, clamp, flags," << endl <<
+ " focus, bg_color, metadata" << endl;
+ }
+
+ if (pos == std::string::npos)
+ break;
+ };
+ }
+}
+
+void list_child_canvases(string prefix, Canvas::Handle canvas)
+{
+ Canvas::Children children(canvas->children());
+ for (Canvas::Children::iterator iter = children.begin(); iter != children.end(); iter++)
+ {
+ cout << prefix << ":" << (*iter)->get_id() << endl;
+ list_child_canvases(prefix + ":" + (*iter)->get_id(), *iter);
+ }
+}
+
+void list_canvas_info(Job job)
+{
+ Canvas::Handle canvas(job.canvas);
+ const RendDesc &rend_desc(canvas->rend_desc());
+
+ if (job.canvas_info_all || job.canvas_info_time_start)
+ {
+ cout << endl << "# " << _("Start Time") << endl;
+ cout << "time_start" << "=" << rend_desc.get_time_start().get_string().c_str() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_time_end)
+ {
+ cout << endl << "# " << _("End Time") << endl;
+ cout << "time_end" << "=" << rend_desc.get_time_end().get_string().c_str() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_frame_rate)
+ {
+ cout << endl << "# " << _("Frame Rate") << endl;
+ cout << "frame_rate" << "=" << rend_desc.get_frame_rate() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_frame_start)
+ {
+ cout << endl << "# " << _("Start Frame") << endl;
+ cout << "frame_start" << "=" << rend_desc.get_frame_start() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_frame_end)
+ {
+ cout << endl << "# " << _("End Frame") << endl;
+ cout << "frame_end" << "=" << rend_desc.get_frame_end() << endl;
+ }
+
+ if (job.canvas_info_all)
+ cout << endl;
+
+ if (job.canvas_info_all || job.canvas_info_w)
+ {
+ cout << endl << "# " << _("Width") << endl;
+ cout << "w" << "=" << rend_desc.get_w() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_h)
+ {
+ cout << endl << "# " << _("Height") << endl;
+ cout << "h" << "=" << rend_desc.get_h() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_image_aspect)
+ {
+ cout << endl << "# " << _("Image Aspect Ratio") << endl;
+ cout << "image_aspect" << "=" << rend_desc.get_image_aspect() << endl;
+ }
+
+ if (job.canvas_info_all)
+ cout << endl;
+
+ if (job.canvas_info_all || job.canvas_info_pw)
+ {
+ cout << endl << "# " << _("Pixel Width") << endl;
+ cout << "pw" << "=" << rend_desc.get_pw() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_ph)
+ {
+ cout << endl << "# " << _("Pixel Height") << endl;
+ cout << "ph" << "=" << rend_desc.get_ph() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_pixel_aspect)
+ {
+ cout << endl << "# " << _("Pixel Aspect Ratio") << endl;
+ cout << "pixel_aspect" << "=" << rend_desc.get_pixel_aspect() << endl;
+ }
+
+ if (job.canvas_info_all)
+ cout << endl;
+
+ if (job.canvas_info_all || job.canvas_info_tl)
+ {
+ cout << endl << "# " << _("Top Left") << endl;
+ cout << "tl" << "=" << rend_desc.get_tl()[0]
+ << " " << rend_desc.get_tl()[1] << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_br)
+ {
+ cout << endl << "# " << _("Bottom Right") << endl;
+ cout << "br" << "=" << rend_desc.get_br()[0]
+ << " " << rend_desc.get_br()[1] << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_physical_w)
+ {
+ cout << endl << "# " << _("Physical Width") << endl;
+ cout << "physical_w" << "=" << rend_desc.get_physical_w() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_physical_h)
+ {
+ cout << endl << "# " << _("Physical Height") << endl;
+ cout << "physical_h" << "=" << rend_desc.get_physical_h() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_x_res)
+ {
+ cout << endl << "# " << _("X Resolution") << endl;
+ cout << "x_res" << "=" << rend_desc.get_x_res() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_y_res)
+ {
+ cout << endl << "# " << _("Y Resolution") << endl;
+ cout << "y_res" << "=" << rend_desc.get_y_res() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_span)
+ {
+ cout << endl << "# " << _("Diagonal Image Span") << endl;
+ cout << "span" << "=" << rend_desc.get_span() << endl;
+ }
+
+ if (job.canvas_info_all)
+ cout << endl;
+
+ if (job.canvas_info_all || job.canvas_info_interlaced)
+ {
+ cout << endl << "# " << _("Interlaced") << endl;
+ cout << "interlaced" << "=" << rend_desc.get_interlaced() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_antialias)
+ {
+ cout << endl << "# " << _("Antialias") << endl;
+ cout << "antialias" << "=" << rend_desc.get_antialias() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_clamp)
+ {
+ cout << endl << "# " << _("Clamp") << endl;
+ cout << "clamp" << "=" << rend_desc.get_clamp() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_flags)
+ {
+ cout << endl << "# " << _("Flags") << endl;
+ cout << "flags" << "=" << rend_desc.get_flags() << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_focus)
+ {
+ cout << endl << "# " << _("Focus") << endl;
+ cout << "focus" << "=" << rend_desc.get_focus()[0]
+ << " " << rend_desc.get_focus()[1] << endl;
+ }
+
+ if (job.canvas_info_all || job.canvas_info_bg_color)
+ {
+ cout << endl << "# " << _("Background Color") << endl;
+ cout << "bg_color" << "=" << rend_desc.get_bg_color().get_string().c_str() << endl;
+ }
+
+ if (job.canvas_info_all)
+ cout << endl;
+
+ if (job.canvas_info_all || job.canvas_info_metadata)
+ {
+ std::list<String> keys(canvas->get_meta_data_keys());
+ cout << endl << "# " << _("Metadata") << endl;
+ for (std::list<String>::iterator iter = keys.begin(); iter != keys.end(); iter++)
+ cout << *iter << "=" << canvas->get_meta_data(*iter) << endl;
+ }
+}
+
/* === M E T H O D S ======================================================= */
/* === E N T R Y P O I N T ================================================= */
#ifdef ENABLE_NLS
bindtextdomain("synfig", LOCALEDIR);
+ bind_textdomain_codeset("synfig", "UTF-8");
textdomain("synfig");
#endif
cerr<<_("FATAL: Synfig Version Mismatch")<<endl;
return SYNFIGTOOL_BADVERSION;
}
+
if(argc==1)
{
- display_help(0);
+ display_help(false);
return SYNFIGTOOL_BLANK;
}
return ret;
// Open the composition
- job_list.front().root=open_canvas(job_list.front().filename);
+ 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)
{
- 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;
}
+ bool list_canvases = false;
+ extract_list_canvases(imageargs, list_canvases);
+ job_list.front().list_canvases = list_canvases;
+
+ extract_canvas_info(imageargs, job_list.front());
+
job_list.front().root->set_time(0);
string canvasid;
{
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)
{
cerr<<_("Throwing out job...")<<endl;
job_list.pop_front();
continue;
-
}
}
else
extract_append(imageargs,composite_file);
if(!composite_file.empty())
{
- Canvas::Handle composite(open_canvas(composite_file));
+ String errors, warnings;
+ Canvas::Handle composite(open_canvas(composite_file, errors, warnings));
if(!composite)
+ {
+ cerr<<_("Unable to append '")<<composite_file<<"'."<<endl;
break;
+ }
Canvas::reverse_iterator iter;
for(iter=composite->rbegin();iter!=composite->rend();++iter)
{
job_list.front().target=synfig::Target::create(target_name,job_list.front().outfilename);
if(target_name=="sif")
- {
job_list.front().sifout=true;
- }
else
{
if(!job_list.front().target)
// Set the threads for the target
if(job_list.front().target && Target_Scanline::Handle::cast_dynamic(job_list.front().target))
- {
Target_Scanline::Handle::cast_dynamic(job_list.front().target)->set_threads(threads);
- }
if(imageargs.size())
{
RenderProgress p;
p.task(job_list.front().filename+" ==> "+job_list.front().outfilename);
- if(!job_list.front().sifout)
+ if(job_list.front().sifout)
{
- VERBOSE_OUT(1)<<_("Rendering...")<<endl;
- etl::clock timer;
- timer.reset();
- // Call the render member of the target
- if(!job_list.front().target->render(&p))
+ if(!save_canvas(job_list.front().outfilename,job_list.front().canvas))
{
cerr<<"Render Failure."<<endl;
return SYNFIGTOOL_RENDERFAILURE;
}
- if(print_benchmarks)
- {
- cout<<job_list.front().filename+": Rendered in "<<timer()<<" seconds."<<endl;
- }
+ }
+ else if (job_list.front().list_canvases)
+ {
+ list_child_canvases(job_list.front().filename + "#", job_list.front().canvas);
+ cerr << endl;
+ }
+ else if (job_list.front().canvas_info)
+ {
+ list_canvas_info(job_list.front());
+ cerr << endl;
}
else
{
- if(!save_canvas(job_list.front().outfilename,job_list.front().canvas))
+ VERBOSE_OUT(1)<<_("Rendering...")<<endl;
+ etl::clock timer;
+ timer.reset();
+ // Call the render member of the target
+ if(!job_list.front().target->render(&p))
{
cerr<<"Render Failure."<<endl;
return SYNFIGTOOL_RENDERFAILURE;
}
+ if(print_benchmarks)
+ cout<<job_list.front().filename+": Rendered in "<<timer()<<" seconds."<<endl;
}
}