diff options
| author | Comment <tim@gray.(none)> | 2013-11-05 20:25:00 +0000 |
|---|---|---|
| committer | Comment <tim@gray.(none)> | 2013-11-05 20:25:00 +0000 |
| commit | 9462492cae4d94157538f353d67f2f6daaa45259 (patch) | |
| tree | 530c266425bad822a8fc73b183b64820c6c3f0bc | |
| parent | b60ef5570f005374e688d62c69017543befca74e (diff) | |
overlay
| -rw-r--r-- | rotord/src/cvimage.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rotord/src/cvimage.cpp b/rotord/src/cvimage.cpp index 8f2c181..2d0f8e2 100644 --- a/rotord/src/cvimage.cpp +++ b/rotord/src/cvimage.cpp @@ -138,14 +138,14 @@ namespace Rotor { //} return *this; } - Image & Image::overlay(cv::Mat &other){ + Image & Image::overlay(const Image &other){ if (other.w!=w||other.h!=h) { cerr<<"Rotor: cannot overlay images with different sizes! (wanted "<<w<<"x"<<h<<", got "<<other.w<<"x"<<other.h<<")"<<endl; //why not?? } else { for (int i=0;i<h*w*3;i++) { - rgb.data[i]=pixels.overlsy[rgb.data[i]][other.rgb.data[i]]; + rgb.data[i]=pixels.overlay[rgb.data[i]][other.rgb.data[i]]; } } return *this; |
