Commits · 78dd1893bb854b314ea22a6a61cda0f910354dfb · submodule / opencv

21 Oct, 2012 1 commit
- added tests for cv::merge, cv::split, cv::phase · 78dd1893
  Maria Dimashova authored Oct 20, 2012
  
  78dd1893
19 Oct, 2012 12 commits
- Merge branch '2.4' · d9ffe5e7
  Andrey Kamaev authored Oct 19, 2012
  
  d9ffe5e7
- Normalize android/scripts/wincfg.cmd.tmpl · cb66dd80
  Andrey Kamaev authored Oct 19, 2012
  
  cb66dd80
- Merge pull request #59 from taka-no-me:doc/fix-signatures-master · e8dd7379
  Andrey Kamaev authored Oct 19, 2012
  
  e8dd7379
- Merge pull request #54 from taka-no-me:doc/fix-signatures · 546ec2af
  Andrey Kamaev authored Oct 19, 2012
  
  546ec2af
- Merge branch '2.4' · 5bc104ce
  Andrey Kamaev authored Oct 19, 2012
  
  5bc104ce
- Merge pull request #50 from taka-no-me:parallel/fix-build-2445 · 09abcd56
  Andrey Kamaev authored Oct 19, 2012
  
  09abcd56
- Include unistd.h to parallel.cpp on UNIX-like systems · 7173c823
  Andrey Kamaev authored Oct 17, 2012
```
This fixes build without TBB and CUDA. Issue #2445
```
  7173c823
- Merge pull request #63 from jet47/gpu-sep-filters · ec8fb323
  marina.kolpakova authored Oct 19, 2012
  
  ec8fb323
- gpu separable filters for CV_8UC3, CV_32FC3 and CV_32FC4 types · 34b4a35e
  Vladislav Vinogradov authored Oct 18, 2012
  
  34b4a35e
- Merge pull request #61 from vpisarev/bug_2509 · 9a97c74e
  Andrey Kamaev authored Oct 19, 2012
  
  9a97c74e
- Merge pull request #60 from kirill-kornyakov/documentation-link-to-answers2 · 49397f79
  Andrey Kamaev authored Oct 19, 2012
  
  49397f79
- Merge pull request #51 from taka-no-me/java/fix-build-after-normalization · 1341c642
  Andrey Kamaev authored Oct 19, 2012
  
  1341c642
18 Oct, 2012 8 commits
- Merge pull request #57 from vpisarev/bug_2429_2.4 · 65d07c56
  Andrey Kamaev authored Oct 18, 2012
  
  65d07c56
- Fix weight calculation for the last pixel in generic area resize. · e1c3ffb2
  Andrey Kamaev authored Oct 18, 2012
```
Also removed assigned only variable.
```
  e1c3ffb2
- fixed bug #2429 · 80f9bd86
  Vadim Pisarevsky authored Oct 17, 2012
```
[edit: cleaned whitespace]
```
  80f9bd86
- fixed bug #2059 · c40718ab
  Vadim Pisarevsky authored Oct 18, 2012
  
  c40718ab
- changed link to Q&A forum in the docs · 908f25bc
  Kirill Kornyakov authored Oct 15, 2012
  
  908f25bc
- Merge pull request #56 from vpisarev/bug_2447_2.4 · 634fedc3
  Andrey Kamaev authored Oct 18, 2012
  
  634fedc3
- fix bug #2447 - unary operator bug for single column matrix · f5742e6c
  Vadim Pisarevsky authored Oct 17, 2012
  
  f5742e6c
- Eliminate discrepancies between signatures in documentation and OpenCV headers · 73bbabf2
  Andrey Kamaev authored Oct 18, 2012
```
All errors were found by doc/check_docs2.py
```
  73bbabf2
17 Oct, 2012 6 commits
- Normalize whitespace in documentation and text files · 0e7ca71d
  Andrey Kamaev authored Oct 17, 2012
  
  0e7ca71d
- Eliminate discrepancies between signatures in documentation and OpenCV headers · 461b69f6
  Andrey Kamaev authored Oct 17, 2012
```
All errors were found by doc/check_docs2.py
```
  461b69f6
- Fix Java API generation after normalization · 57d077b9
  Andrey Kamaev authored Oct 17, 2012
```
The rst_parser.py was unintentionally corrupted by normalization.
This fix repairs the script and fixes Java API generation.
```
  57d077b9
- Merge branch '2.4' · 93372468
  Andrey Kamaev authored Oct 17, 2012
  
  93372468
- Normalize line endings and whitespace · 81f826db
  OpenCV Buildbot authored Oct 17, 2012
  
  81f826db
- Normalize line endings and whitespace · 04384a71
  OpenCV Buildbot authored Oct 16, 2012
  
  04384a71
16 Oct, 2012 13 commits
- Merge branch 'release2.4.3' into 2.4 · 69020da6
  Andrey Kamaev authored Oct 16, 2012
  
  69020da6
- Fix build of samples · f4e33ea0
  Andrey Kamaev authored Oct 16, 2012
  
  f4e33ea0
- Revert opencv_videostab to the state of 2.4.2 · 7225f89e
  Andrey Kamaev authored Oct 16, 2012
  
  7225f89e
- Fix binary compatibility of opencv_gpu · e5437e54
  marina.kolpakova authored Oct 16, 2012
  
  e5437e54
- Fix binary compatibility of Java wrappers · ed511625
  Andrey Kamaev authored Oct 16, 2012
  
  ed511625
- Fix binary compatibility of opencv_objdetect · 42c8a42a
  Andrey Kamaev authored Oct 16, 2012
  
  42c8a42a
- Fix binary compatibility of opencv_nonfree · a07cc844
  Andrey Kamaev authored Oct 15, 2012
  
  a07cc844
- Fix binary compatibility of opencv_contrib · 26bcb381
  Andrey Kamaev authored Oct 15, 2012
  
  26bcb381
- Fix binary compatibility of opencv_stitching · 971d02cd
  Andrey Kamaev authored Oct 15, 2012
  
  971d02cd
- Fix binary compatibility of opencv_ml · edee177e
  Andrey Kamaev authored Oct 16, 2012
  
  edee177e
- Revert "skip of table header in MLData (#1962)" · 7d6a2f1b
  Andrey Kamaev authored Oct 15, 2012
```
This reverts commit 4d36be87.

Conflicts:
	modules/ml/include/opencv2/ml/ml.hpp
	modules/ml/src/data.cpp
```
  7d6a2f1b
- Revert "yet another portion of changes towards the binary compatibility" · 0dc3d610
  Andrey Kamaev authored Oct 15, 2012
```
This reverts commit 618fbf55.
```
  0dc3d610
- Fix binary compatibility of opencv_features2d · 5a730d09
  Andrey Kamaev authored Oct 15, 2012
  
  5a730d09