Andrey Kamaev
d2192c0759
Move cv::Matx and cv::Vec to separate header
2013-04-01 15:24:33 +04:00
Andrey Kamaev
f77a375354
Merge branch '2.4'
2013-03-29 19:38:35 +04:00
Andrey Kamaev
7d37625fc3
Merge pull request #718 from apavlenko:java_tests_fix
2013-03-29 18:21:14 +04:00
Andrey Kamaev
b5dd26e4c7
Merge pull request #704 from taka-no-me:folders
2013-03-29 18:20:27 +04:00
Alexander Bohn / FI$H2k
c66cf08ced
Fix for encoding errors when building Java source
...
The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
(cherry picked from commit f3ee55e042
2013-03-27 17:43:00 +04:00
Andrey Pavlenko
bbf43e8b16
fix for bug #2912 (DescriptorExtractor::compute Java wrapper loses native arg change)
2013-03-26 19:31:16 +04:00
Andrey Kamaev
49f6dad13f
Move cv::KeyPoint and cv::DMatch to core
2013-03-26 16:08:43 +04:00
Andrey Kamaev
f282498b1d
Drop outdated targets and fix solution folders
2013-03-25 21:57:53 +04:00
Andrey Kamaev
be7bbe3aa9
Drop cv:: prefix from cv::String used inside the cv namespace
2013-03-22 22:14:50 +04:00
Andrey Kamaev
688d170de7
Java wrapper is adapted for cv::String
2013-03-22 22:14:33 +04:00
Andrey Kamaev
1ca8f33b4e
Merge branch '2.4'
2013-03-21 23:11:54 +04:00
Andrey Kamaev
89356ff16d
Move non-CV functionality from core.hpp to separate utility.hpp header
2013-03-20 17:56:06 +04:00
Vadim Pisarevsky
959a5c980d
Merge pull request #532 from jet47:super-resolution
2013-03-17 19:13:37 +04:00
Alexander Bohn / FI$H2k
f3ee55e042
Fix for encoding errors when building Java source
...
The generated OpenCV Java source can contain characters outside of ASCII on some systems – this patch allows the ant task to compile them.
2013-03-15 06:47:52 -03:00
Andrey Kamaev
ad5cddc007
Main module headers are moved 1 level up
...
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
Andrey Kamaev
9b7dfd677d
Merge branch '2.4'
2013-03-11 18:50:19 +04:00
Alexander Smorkalov
8942eaf0d7
Stetch support for Android View classes added (Feature #2840 )
2013-03-11 11:17:19 +04:00
Andrey Pavlenko
0e64baaec5
removing redundant code
2013-03-06 13:00:00 +04:00
Andrey Pavlenko
116d3be9c0
moving JNI library to 'build/lib' dir on non-Win
2013-03-05 18:41:44 +04:00
Andrey Kamaev
9e12b7c3c2
Merge release 2.4.4
2013-03-04 19:43:49 +04:00
Andrey Kamaev
79cf292d78
Merge pull request #590 from apavlenko:java_fixes
2013-02-28 18:07:33 +04:00
Andrey Pavlenko
d18b2c2502
patch -> revision
2013-02-28 17:19:52 +04:00
Andrey Pavlenko
c24d7cc066
adding more version-related variables
2013-02-28 16:56:53 +04:00
Andrey Pavlenko
5321da92cb
adding/fixing version suffix for desktop java library on all OSes
2013-02-28 16:12:44 +04:00
Andrey Kamaev
891d7da6ee
Merge branch '2.4'
2013-02-28 11:17:06 +04:00
Andrey Kamaev
7b79eaf5be
Merge pull request #511 from aritzlc:master
2013-02-27 19:33:01 +04:00
Vladislav Vinogradov
7a0d6f7733
Super Resolution module
2013-02-27 13:41:15 +04:00
Andrey Kamaev
e9307259d7
Merge pull request #564 from apavlenko:eclipse_import_fix
2013-02-27 00:05:02 +04:00
Andrey Pavlenko
1c1c3c29c3
fixing eclipse import errors
2013-02-26 19:52:59 +04:00
Alexander Smorkalov
8458f5c489
Android tutorial updated
...
OpenCV version incremented;
New CvCameraViewListener interface description added.
2013-02-26 16:35:02 +04:00
alegarda
0448f240a0
Added constants to gen_java.py
2013-02-26 11:21:43 +01:00
Andrey Kamaev
2a6fb2867e
Remove all using directives for STL namespace and members
...
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Andrey Kamaev
0b8a6da817
Merge branch '2.4'
2013-02-22 17:33:30 +04:00
Alexander Smorkalov
9f39c8eaa1
OpenCV 2.4.4 preparation
...
Manager verison incremented;
Additional constatnt for library intialization added;
Documents updated.
2013-02-21 14:42:28 +04:00
Andrey Kamaev
9498856b22
Fix documentation problems found by check_docs2 script
2013-02-20 15:07:13 +04:00
Andrey Kamaev
956aa68fb5
Merge branch '2.4'
2013-02-12 20:30:17 +04:00
Andrey Kamaev
b44b920997
Merge branch '2.4'
2013-02-12 16:30:18 +04:00
Alexander Smorkalov
1751a963f2
Build info output for all android apps added.
...
OpenCV build information output to logcat added to OpenCV initialization code;
Documenation for cv::getBuildInformation() added.
2013-02-12 11:19:05 +04:00
Andrey Kamaev
b6e7aeabe0
Merge pull request #476 from apavlenko:eclipse_import_fix
2013-02-11 21:38:07 +04:00
Andrey Kamaev
059ea5bebe
Merge pull request #471 from apavlenko:jar_install
2013-02-11 20:46:48 +04:00
Andrey Pavlenko
54bcaa4934
fixing eclipse import errors that can also be fixed via 'Fix Project Properties' menu
2013-02-11 19:49:18 +04:00
Andrey Pavlenko
b337d84adf
configure desktop Java install, making JNI library name correct, and making it fat when possible
2013-02-11 16:28:19 +04:00
Andrey Kamaev
1869f77c0f
Merge pull request #457 from taka-no-me:fix_vars_expansion
2013-02-11 14:37:14 +04:00
Alexander Smorkalov
283b26e2db
Issue in NativeCameraView and JavaCameraView fixed.
...
In previous version getWidth() and getHeight() values were used instead method parameters.
2013-02-11 09:43:44 +04:00
Andrey Kamaev
571665b559
Fix CMake variables substitution in Android project files
2013-02-08 18:21:49 +04:00
Alexander Smorkalov
076941bb07
15-puzzle app reverted to usage of old CvCameraViewListener implementation;
...
super.onPause() call moved to begining of onPause method according Google recomandations.
2013-02-08 12:36:33 +04:00
Alexander Smorkalov
f8720ec60e
Code review issues fixed. Compatibility issues fixed.
2013-02-07 13:11:08 +04:00
Alexander Smorkalov
3ef588b877
onCameraFrame callback signature changed. CvCameraFame interface added.
...
New interface allows to get one RGBA or Gray frame from camera or both in the same time;
New interface fixes data rase in samples also.
2013-02-04 17:43:45 +04:00
Andrey Kamaev
c527340cb6
Merge branch 2.4
2013-02-04 17:15:55 +04:00
Andrey Kamaev
6f1961031c
Update regression checks in Java test
...
This follows SURF changes in 1f261c2
2013-02-01 17:16:28 +04:00
