From 8138e26163e39c327c3e645ad1cccc896fa10dae Mon Sep 17 00:00:00 2001
From: Niklas Frisk <niklas.frisk@interaktionsbyran.se>
Date: Tue, 7 Oct 2014 09:40:56 +0200
Subject: [PATCH] Fixes  #3910, flags in _prepareImgAndDrawKeypoints are now
 binary OR'ed instead of added.

Conflicts:
	modules/features2d/src/draw.cpp
---
 modules/features2d/src/draw.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/features2d/src/draw.cpp b/modules/features2d/src/draw.cpp
index 6673e46317..63410e713c 100644
--- a/modules/features2d/src/draw.cpp
+++ b/modules/features2d/src/draw.cpp
@@ -159,10 +159,10 @@ static void _prepareImgAndDrawKeypoints( InputArray img1, const std::vector<KeyP
     if( !(flags & DrawMatchesFlags::NOT_DRAW_SINGLE_POINTS) )
     {
         Mat _outImg1 = outImg( Rect(0, 0, img1size.width, img1size.height) );
-        drawKeypoints( _outImg1, keypoints1, _outImg1, singlePointColor, flags + DrawMatchesFlags::DRAW_OVER_OUTIMG );
+        drawKeypoints( _outImg1, keypoints1, _outImg1, singlePointColor, flags | DrawMatchesFlags::DRAW_OVER_OUTIMG );
 
         Mat _outImg2 = outImg( Rect(img1size.width, 0, img2size.width, img2size.height) );
-        drawKeypoints( _outImg2, keypoints2, _outImg2, singlePointColor, flags + DrawMatchesFlags::DRAW_OVER_OUTIMG );
+        drawKeypoints( _outImg2, keypoints2, _outImg2, singlePointColor, flags | DrawMatchesFlags::DRAW_OVER_OUTIMG );
     }
 }