Jcrist99 770c69a978 fix for feature2d java wrappers as described in this post: http://ans… (#7372) ...

* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/

* fix for feature2d java wrappers as described in this post: http://answers.opencv.org/question/101675/surfsift-java-wrapper-for-opencv-3xosx-1011/

* rollback of one change as requested (similar change already merged)

2016-10-06 15:48:26 +03:00

..

calib3d

Merge pull request #7336 from K-Shinotsuka:issue23

2016-10-04 12:29:46 +00:00

core

normHamming done with AVX 2 intrinsics (ver 2) (#7405)

2016-10-05 21:23:32 +04:00

cudaarithm

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

cudabgsegm

Fixed identifiers warns

2016-09-30 15:16:29 +05:30

cudacodec

Fixed identifiers warns

2016-09-30 15:16:29 +05:30

cudafeatures2d

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

cudafilters

fix defines typo

2016-10-03 18:29:11 +03:00

cudaimgproc

Fixed identifiers warns

2016-09-30 15:16:29 +05:30

cudalegacy

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

cudaobjdetect

Fixed identifiers warns

2016-09-30 15:16:29 +05:30

cudaoptflow

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

cudastereo

Fixed identifiers warns

2016-09-30 15:16:29 +05:30

cudawarping

Fixed identifiers warns

2016-09-30 15:16:29 +05:30

cudev

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

features2d

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

flann

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

highgui

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

imgcodecs

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

imgproc

Merge pull request #7311 from fran6co:lsd

2016-10-05 11:27:43 +00:00

java

fix for feature2d java wrappers as described in this post: http://ans… (#7372)

2016-10-06 15:48:26 +03:00

ml

Merge pull request #7371 from mshabunin:aruco-java-wrap

2016-10-01 15:38:59 +00:00

objdetect

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

photo

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

python

Merge pull request #6078 from PolarNick239:master

2016-10-05 17:27:23 +00:00

shape

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

stitching

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

superres

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

ts

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

video

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

videoio

make sure that the empty mat is copied to UMat properly - i.e. UMat becomes empty. Before the patch such copy operation crashed

2016-10-05 14:07:50 +03:00

videostab

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

viz

Merge pull request #7370 from souch55:Fixxn

2016-10-01 10:44:56 +00:00

world

Fixed identifiers warns

2016-09-30 15:16:29 +05:30

CMakeLists.txt

world fix

2014-08-05 20:12:35 +04:00