1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-19 02:16:34 +08:00
Commit Graph

135 Commits

Author SHA1 Message Date
Alexander Alekhin
16daec9c5c Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2018-08-29 16:24:29 +03:00
gdemarcq
1f6d6f0626 Merge pull request #1736 from gdemarcq:staticSaliencyFineGrained_corrections
* Correction for computeBinaryMap crash:
- the function staticSaliencyFineGrained::computeSaliency() outputs a
normalized floating point image
- Add an assert in StaticSaliency::computeBinaryMap in order to check
image depth (must be CV_32F)

* - Change assert in cv::Saliency::StaticSaliency::computeBinaryMap()
- Change normalization factor in cv::Saliency::StaticSaliencyFineGrained::computeSaliencyImpl()
2018-08-28 15:47:17 +03:00
d.bouron
0e03fea432 Fix corruption exception in StaticSaliencySpectralResidual
In some case, Discrete Fourier Transform in computeSaliencyImpl() returns
magnitude matrix which contains zero values.
Then, log() returns -inf values and normalization with blur() returns -nan.
When computeBinaryMap() is called double free or corruption exception occurs
because kmeans() fails to compute distance.

Signed-off-by: d.bouron <d.bouron@criteo.com>
2018-06-26 18:34:09 +02:00
Alexander Alekhin
5d9fc41b9e Merge pull request #1588 from alalek:cv_override_final 2018-03-28 20:10:21 +00:00
Alexander Alekhin
62b4709b04 saliency: apply CV_OVERRIDE/CV_FINAL 2018-03-28 16:50:00 +03:00
Alexander Alekhin
4c42ed6b4f build: fix includes 2018-03-19 11:40:04 +03:00
Maksim Shabunin
c99d1c3b04 Fixed several warnings produced by clang-6.0.0 2018-01-30 13:28:40 +03:00
Vitaly Tuzov
8c394a4f2e Updated internal calls to linear resize to use bit-exact version 2017-12-14 13:00:09 +03:00
berak
102c80a2c9 remove some non-ascii symbols 2017-12-05 18:02:15 +01:00
Alexander Alekhin
e878ea952a build: fix defines 2017-11-27 14:43:58 +03:00
Egor Pugin
09c3be3f0f Fix incorrect windows definition.
Old one causes build errors.
2017-11-26 01:56:05 +03:00
berak
00ea0f49df saliency: improve BING handling 2017-10-23 17:56:35 +02:00
Vladislav Sovrasov
e1cd60c96e saliency: remove broken perf tests 2017-10-03 16:57:55 +03:00
Vladislav Sovrasov
cf68a01138 saliency: cleanup module and samples 2017-10-02 17:31:36 +03:00
jaco
3f4e7dfc10 ceil explicit cast added 2017-10-02 16:30:46 +03:00
jaco
83f80a34ca windows warning wip 2017-10-02 16:30:46 +03:00
jaco
b691b7442f noise control implementation started
noise control implementation ended

noise control errors fixed (part I)

noise control errors fixed (ended)

Perf Test for staticSaliencySpectralResidual and objectnessBING added

improvements and bugs fixed

saliency perf test added

matrices optimization

Where possible, CV_8U matrices have been used in place of CV_32F

new sorting algorithm implemented (first part)

new sorting algorithm implemented (second part)

new sorting algorithm implemented (finished)
2017-10-02 16:30:46 +03:00
Alexander Alekhin
62e77e9945 build: fix usage of unsupported cv::Mat types 2017-08-25 19:07:05 +03:00
Maksim Shabunin
f8807f18cd Reduced modules dependencies:
- made some of dependencies explicit
- removed dependencies to highgui and some other modules where possible
- modified some samples to build without modules
2017-03-15 18:00:21 +03:00
utibenkei
3c1a2b7361 Add CV_WRAP to getobjectnessValues(). 2017-03-07 01:37:18 +09:00
Alexander Alekhin
2feb23cf36 cmake: include contrib modules into "opencv_world" 2017-01-25 13:21:03 +03:00
Alexander Alekhin
e40c23e985 saliency: disable for ICC 2016-12-15 17:08:35 +03:00
Vladislav Sovrasov
73c03fd14b Add export specifiers in StaticSaliencyFineGrained 2016-10-17 16:37:33 +03:00
samontab
a39e3623ae Add Fine Grained Saliency algorithm 2016-10-17 14:27:23 +03:00
Alexander Alekhin
5f8d3d756b eliminate compiler warnings 2016-10-07 20:09:53 +03:00
Vladislav Sovrasov
fddefa2d64 Revert last changes in CMake for saliency module 2016-10-07 11:39:59 +03:00
Vladislav Sovrasov
94e919eb45 Wrap all methods from ObjectnessBING, add create methods for all Saliency classes 2016-10-04 18:32:45 +03:00
Minh Ngo
5b2d6a667d Exporting saliency classes to Python
Fixing compilation

Patched the saliency module to use ObjectivenessBING bounding box
proposals from python.

Usage:

```
bing = cv2.saliency.ObjectnessBING()
img = cv2.imread('/home/ignotus/Pictures/10376146_973700932714682_2056967515849182952_n.jpg')
bing.computeSaliency(img)
```
2016-10-04 14:22:06 +03:00
Gary Bradski
6c8e7eeb89 Update README.md 2016-03-27 15:29:03 -07:00
tharunkalwa
48e0fc9b89 Update objectnessBING.cpp
The rectangle at top is not having maximum objectness value.
2016-01-07 16:57:53 +05:30
Maksim Shabunin
189c2b47c6 Fixed warnings for XCode 7.1.1 and cmake 3.3.2, rewrote one method in sliency to avoid clang 7.0.0 crash 2015-11-17 15:28:05 +03:00
Patrick Snape
8682d7d054 floor and ceil have no int overload on MSVC
Adding float casts allows them to compile on MSVC and should not
affect other compilers.
2015-08-20 11:26:17 +01:00
Patrick Snape
2b766bf091 Use std::numeric_limits<float>::quiet_NaN()
NAN is a compiler specific constant that does not exist on
visual studio. I also noticed that some NAN instances had been
cast to float, whereas quiet_NaN is both 1) defined by the
standard and 2) templated for the correct type. This is a much
more portable method of getting a NaN value.
2015-08-20 11:24:45 +01:00
Alexander Stohr
df88c31892 eliminate some warnings 2015-07-22 13:05:10 +02:00
Vadim Pisarevsky
e3995236ed added test for http://code.opencv.org/issues/3943;
replaced "const InputArray" with "InputArray" to avoid warnings about "const const _InputArray&"
2015-05-18 19:07:30 +03:00
Maksim Shabunin
da7ff82d19 Replaced CV_IMPL_PROPERTY macros in public headers 2015-03-18 17:56:47 +03:00
Vadim Pisarevsky
ec2b3ed662 Merge pull request #185 from mshabunin/remove-docs
Removed sphinx documentation
2015-03-16 13:07:31 +03:00
Maksim Shabunin
67a2066c4b Java and python wrappers for contrib modules 2015-02-26 15:46:02 +03:00
Maksim Shabunin
7d9bbdcaad Remove all sphinx files 2015-02-17 12:49:37 +03:00
Maksim Shabunin
34131405df Removed some methods from cv::Algorithm and changed ml module interfaces 2015-02-17 11:45:57 +03:00
Maksim Shabunin
f52ba671dc Disable some modules for iOS framework world build 2014-12-08 14:37:06 +03:00
Maksim Shabunin
a20c5c8dd9 Doxygen documentation for all modules 2014-12-01 15:54:42 +03:00
StevenPuttemans
c20ea8e7e8 adding more clear documentation 2014-10-10 21:17:46 +02:00
Vadim Pisarevsky
f1f579f557 do not use __popcnt64 2014-09-18 15:03:34 +04:00
Vadim Pisarevsky
d4d2a6ef7b fixed android warnings 2014-09-03 12:34:54 +04:00
jaco
e2fde8a610 commented code removed 2014-09-02 15:36:38 +02:00
jaco
9462b818c7 new windows compile warning fixed 2014-08-21 15:35:34 +02:00
jaco
07e66a4b4a new windows build error fixing 3 2014-08-21 15:19:36 +02:00
jaco
bdb26b3d22 new windows build error fixing 2 2014-08-21 14:23:23 +02:00
jaco
dd951a80db windows build error fixing 2014-08-21 13:41:55 +02:00