Merge pull request opencv#8240 from hewj03:issue_1012_contrib

mshabunin · mshabunin · commit e192c6842e3b · 2017-02-22T15:51:07.000Z
diff --git a/modules/stitching/src/cuda/multiband_blend.cu b/modules/stitching/src/cuda/multiband_blend.cu
@@ -90,7 +90,7 @@ namespace cv { namespace cuda { namespace device
 
             if (x < width && y < height)
             {
-                static const float WEIGHT_EPS = 1e-5f;
+                const float WEIGHT_EPS = 1e-5f;
                 const short3 v = ((short3*)src.ptr(y))[x];
                 float w = weight.ptr(y)[x];
                 ((short3*)src.ptr(y))[x] = make_short3(static_cast<short>(v.x / (w + WEIGHT_EPS)),

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ namespace cv { namespace cuda { namespace device`
`90`	`90`
`91`	`91`	`if (x < width && y < height)`
`92`	`92`	`{`
`93`		`- static const float WEIGHT_EPS = 1e-5f;`
	`93`	`+ const float WEIGHT_EPS = 1e-5f;`
`94`	`94`	`const short3 v = ((short3*)src.ptr(y))[x];`
`95`	`95`	`float w = weight.ptr(y)[x];`
`96`	`96`	`((short3*)src.ptr(y))[x] = make_short3(static_cast<short>(v.x / (w + WEIGHT_EPS)),`