summaryrefslogtreecommitdiff
path: root/rotord/cvimage.h
diff options
context:
space:
mode:
Diffstat (limited to 'rotord/cvimage.h')
-rw-r--r--rotord/cvimage.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/rotord/cvimage.h b/rotord/cvimage.h
index 6c237b4..7935ded 100644
--- a/rotord/cvimage.h
+++ b/rotord/cvimage.h
@@ -161,6 +161,8 @@ namespace Rotor {
Image & operator+=(const Image &other);
Image & operator*=(const Image &other);
Image & add_wrap(const Image &other);
+ Image & alpha_blend(const Image &other);
+ Image & alpha_merge(const Image &other);
Image & operator*=(const float &amount);
Image * operator*(const float &amount);
Image * operator+(const float &amount);
@@ -173,5 +175,6 @@ namespace Rotor {
bool ownsRGBdata,ownsAdata,ownsZdata; //better done through auto_ptr?
cv::Mat rgb;
+ cv::Mat alpha;
};
}