projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid warning.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
target_scanline.cpp
diff --git
a/synfig-core/trunk/src/synfig/target_scanline.cpp
b/synfig-core/trunk/src/synfig/target_scanline.cpp
index
0272442
..
23b86b3
100644
(file)
--- a/
synfig-core/trunk/src/synfig/target_scanline.cpp
+++ b/
synfig-core/trunk/src/synfig/target_scanline.cpp
@@
-125,7
+125,7
@@
synfig::Target_Scanline::render(ProgressCallback *cb)
curr_frame_=0;
if( !init() ){
curr_frame_=0;
if( !init() ){
- if(cb) cb->error(_("Target initiali
s
ation failure"));
+ if(cb) cb->error(_("Target initiali
z
ation failure"));
return false;
}
return false;
}
@@
-173,7
+173,7
@@
synfig::Target_Scanline::render(ProgressCallback *cb)
#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
Canvas::Handle op_canvas(Canvas::create());
#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
Canvas::Handle op_canvas(Canvas::create());
- optimize_layers(canvas->get_context(), op_canvas);
+ optimize_layers(canvas->get_
time(), canvas->get_
context(), op_canvas);
context=op_canvas->get_context();
#else
context=canvas->get_context();
context=op_canvas->get_context();
#else
context=canvas->get_context();
@@
-199,16
+199,16
@@
synfig::Target_Scanline::render(ProgressCallback *cb)
#if USE_PIXELRENDERING_LIMIT
if(desc.get_w()*desc.get_h() > PIXEL_RENDERING_LIMIT)
{
#if USE_PIXELRENDERING_LIMIT
if(desc.get_w()*desc.get_h() > PIXEL_RENDERING_LIMIT)
{
- synfig::info("Render BROKEN UP! (%d pixels)", desc.get_w()*desc.get_h());
-
Surface surface;
int rowheight = PIXEL_RENDERING_LIMIT/desc.get_w();
Surface surface;
int rowheight = PIXEL_RENDERING_LIMIT/desc.get_w();
+ if (!rowheight) rowheight = 1; // TODO: render partial lines to stay within the limit?
int rows = desc.get_h()/rowheight;
int lastrowheight = desc.get_h() - rows*rowheight;
rows++;
int rows = desc.get_h()/rowheight;
int lastrowheight = desc.get_h() - rows*rowheight;
rows++;
- synfig::info("\t blockh=%d,remh=%d,totrows=%d", rowheight,lastrowheight,rows);
+ synfig::info("Render broken up into %d block%s %d pixels tall, and a final block %d pixels tall",
+ rows-1, rows==2?"":"s", rowheight, lastrowheight);
// loop through all the full rows
if(!start_frame())
// loop through all the full rows
if(!start_frame())
@@
-307,7
+307,7
@@
synfig::Target_Scanline::render(ProgressCallback *cb)
#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
Canvas::Handle op_canvas(Canvas::create());
#ifdef SYNFIG_OPTIMIZE_LAYER_TREE
Canvas::Handle op_canvas(Canvas::create());
- optimize_layers(canvas->get_context(), op_canvas);
+ optimize_layers(canvas->get_
time(), canvas->get_
context(), op_canvas);
context=op_canvas->get_context();
#else
context=canvas->get_context();
context=op_canvas->get_context();
#else
context=canvas->get_context();
@@
-333,17
+333,17
@@
synfig::Target_Scanline::render(ProgressCallback *cb)
#if USE_PIXELRENDERING_LIMIT
if(desc.get_w()*desc.get_h() > PIXEL_RENDERING_LIMIT)
{
#if USE_PIXELRENDERING_LIMIT
if(desc.get_w()*desc.get_h() > PIXEL_RENDERING_LIMIT)
{
- synfig::info("Render BROKEN UP! (%d pixels)", desc.get_w()*desc.get_h());
-
Surface surface;
int totalheight = desc.get_h();
int rowheight = PIXEL_RENDERING_LIMIT/desc.get_w();
Surface surface;
int totalheight = desc.get_h();
int rowheight = PIXEL_RENDERING_LIMIT/desc.get_w();
+ if (!rowheight) rowheight = 1; // TODO: render partial lines to stay within the limit?
int rows = desc.get_h()/rowheight;
int lastrowheight = desc.get_h() - rows*rowheight;
rows++;
int rows = desc.get_h()/rowheight;
int lastrowheight = desc.get_h() - rows*rowheight;
rows++;
- synfig::info("\t blockh=%d,remh=%d,totrows=%d", rowheight,lastrowheight,rows);
+ synfig::info("Render broken up into %d block%s %d pixels tall, and a final block %d pixels tall",
+ rows-1, rows==2?"":"s", rowheight, lastrowheight);
// loop through all the full rows
if(!start_frame())
// loop through all the full rows
if(!start_frame())