diff options
| -rw-r--r-- | rotord/src/cvimage.h | 3 | ||||
| -rw-r--r-- | rotord/src/rotor.h | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/rotord/src/cvimage.h b/rotord/src/cvimage.h index 1210744..bc9c13d 100644 --- a/rotord/src/cvimage.h +++ b/rotord/src/cvimage.h @@ -130,7 +130,8 @@ namespace Rotor { return true; }; bool setup(int _w,int _h){ //set up with internal data - if (_w==0||_h==0) { + if (_w==0||_h==0||(_w*_h*3)>10000000) { + //some kind of elusive thing that shows up only in non debug builds std::cerr<<"Error! cvimage: request to set up image at "<<_w<<"x"<<_h<<std::endl; return false; } diff --git a/rotord/src/rotor.h b/rotord/src/rotor.h index 65f06ac..eb8dce9 100644 --- a/rotord/src/rotor.h +++ b/rotord/src/rotor.h @@ -907,7 +907,7 @@ namespace Rotor { isLoaded=false; segment=0; segment_start=0.0; - lastframe=0; + lastframe=-2; }; Video_bank(map<string,string> &settings): Video_bank() { base_settings(settings); @@ -934,10 +934,10 @@ namespace Rotor { } bool get_frame(double wanted,const Frame_spec &frame){ if (attributes["frame_mode"]->intVal==VIDEOFRAMES_blend){ - if (((int)wanted)!=Base_video::lastframe){ + if (((int)wanted)!=lastframe){ //get a new pair of frames possibly by switching the next one //darn peculiar, as if copying wasn't actually copying - if ((Base_video::lastframe==(((int)wanted)-1))&&(in2.w>0)) { + if ((lastframe==(((int)wanted)-1))&&(in2.w>0)) { in1=in2; } else { @@ -1055,7 +1055,6 @@ namespace Rotor { int clip_loaded; double segment_start; int segment; - int lastframe; }; class Video_output: public Image_node { //Video_output 'presents' the output movie. Aspect ratio, bars, fadein/fadeout would happen here |