summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rotord/cvimage.cpp1
-rw-r--r--rotord/rendercontext.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/rotord/cvimage.cpp b/rotord/cvimage.cpp
index 8cb1f9c..a623bfd 100644
--- a/rotord/cvimage.cpp
+++ b/rotord/cvimage.cpp
@@ -33,6 +33,7 @@ namespace Rotor {
}
return *this;
}
+ //THESE CAN BE OPTIMISED - LOOK INTO USING OPENCV HERE
Image & Image::alpha_blend(const Image &other) {
if (other.w!=w||other.h!=h) {
cerr<<"Rotor: cannot blend images with different sizes! (wanted "<<w<<"x"<<h<<", got "<<other.w<<"x"<<other.h<<")"<<endl;
diff --git a/rotord/rendercontext.cpp b/rotord/rendercontext.cpp
index 1da5725..7a76a70 100644
--- a/rotord/rendercontext.cpp
+++ b/rotord/rendercontext.cpp
@@ -330,6 +330,7 @@ bool Render_context::load_audio(const string &filename,vector<Base_audio_process
}
cerr<<"Rotor: finished audio analysis"<<endl;
+ return true;
}
bool Render_context::load_video(const string &nodeID,const string &filename){
//this is a good standard example of how to find