mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
17,185 Commits 6 Branches 126 Tags 3 GiB
9a66191ea8
Commit Graph

12626 Commits

Author SHA1 Message Date
Pavel Vlasov
6a0d3b06f2 IPPInitSingelton initialization guards; 2015-10-01 17:48:49 +03:00
Miguel Algaba
b71a27b96c Assert fix: allow one cluster as valid parameter 2015-10-01 16:45:59 +02:00
Vadim Pisarevsky
d69b7c332a Merge pull request #5385 from alalek:fix_android_camera_datarace 2015-10-01 13:58:01 +00:00
Philipp Hasper
05846438e3 Typo in CameraBridgeViewBase.java 
Corrected typo and unused imports
 2015-10-01 15:09:14 +02:00
Vadim Pisarevsky
af5e631a7a Merge pull request #5402 from sturkmen72:patch-10 2015-10-01 13:01:26 +00:00
Pavel Vlasov
e837d69f8f IPPInitSingelton was added to contain IPP related global variables; 
OPENCV_IPP env var now allows to select IPP architecture level for IPP9+;
IPP initialization logic was unified across modules;
 2015-10-01 09:58:48 +03:00
Alexander Alekhin
34e4e66bf1 Merge pull request #5419 from lupustr3:pvlasov/ipp9_integration 2015-09-30 17:36:43 +00:00
Alexander Alekhin
9b6424e0c6 Merge pull request #5415 from lupustr3:pvlasov/ipp_version_change 2015-09-29 17:11:30 +00:00
Pavel Vlasov
62854dcc0d Enables support of IPP 9.0.0; 
HAVE_IPP_ICV_ONLY will be undefined if OpenCV was linked against ICV packet from IPP9 or greater. ICV9+ packets will be aligned with IPP in OpenCV APIs
This will ease code management between IPP and ICV
 2015-09-29 17:27:13 +03:00
Pavel Vlasov
75c7917643 IPP_VERSION_X100 was changed to: 
IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR*10 + IPP_VERSION_UPDATE
to manage changes between updates more easily.

IPP_DISABLE_BLOCK was added to ease tracking of disabled IPP functions;
 2015-09-29 17:24:18 +03:00
Alexander Alekhin
ddf82d0b15 Merge pull request #5405 from lupustr3:pvlasov/ipp_functions_refactoring 2015-09-28 17:20:41 +00:00
Suleyman TURKMEN
7c226ed7a2 adding new flags to imread to load image reduced 2015-09-28 02:00:02 +03:00
Alexander Alekhin
dd9da53860 disable String(int) ctor 
MSVC and GCC compilers interprets cv::String a(0) as a valid
statement with conversion of "int" argument to "const char*".
This patch forbids this expected behaviour.
 2015-09-27 14:54:11 +03:00
Balint Cristian
fdbed4a473 Speedup AGAST nonmax-suppression. 2015-09-26 04:43:07 +03:00
Pavel Vlasov
14b006e808 IPP_VERSION_X100 was changed to: 
IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR*10 + IPP_VERSION_UPDATE
to manage changes between updates more easily.

IPP_DISABLE_BLOCK was added to ease tracking of disabled IPP functions;
 2015-09-25 17:50:15 +03:00
Pavel Vlasov
2177c7c5a8 Some IPP functions were encapsulated; 
Minor changes to IPP implementations;
 2015-09-25 17:30:26 +03:00
Alexander Alekhin
3a3f4038bf Merge pull request #5391 from paroj:parser_nonempty 2015-09-25 11:01:09 +00:00
Pavel Rojtberg
46ada3886f fix wrong parsing of values containing '=' 
fixes #5074
 2015-09-24 17:27:07 +02:00
robertxwu
db78de9c3b findChessboardCorners causes crash due to out-of-bounds memory corruption. 
Refer to the following issue for detail:
https://github.com/Itseez/opencv/issues/5145
 2015-09-24 12:59:00 +03:00
Pavel Rojtberg
1dd7f546af CommandLineParser: add special <none> value to disallow empty strings 
some mandatory string keys like paths must not be empty. Add the special
default value `<none>` so the CommandLineParser can enforce this and
generate an according error message for us.
 2015-09-23 15:43:46 +02:00
Alexander Alekhin
e5ece03db1 Merge pull request #5382 from paroj:parserthrow 2015-09-23 10:18:00 +00:00
Alexander Alekhin
6f04385a0e Merge pull request #5379 from sturkmen72:patch-9 2015-09-23 10:15:03 +00:00
berak
74fc9acdd1 initialize temp_train_samples in SVM::autoTrain 
add smoke test
 2015-09-23 11:08:48 +02:00
Pavel Rojtberg
a388806555 enable additional CommandLineParser tests 2015-09-22 18:37:51 +02:00
Pavel Rojtberg
2ced3ba276 CommandLineParser: throw on programmer error 
requesting a previously undeclared key is most likely an programming
error. e.g. a typo "--unused vs --unsued".
So throw in those cases.

Add an according failure testcase.
 2015-09-22 18:35:49 +02:00
Alexander Alekhin
eb2e061e3f fix Android camera datarace (mCameraFrameReady) 2015-09-22 17:03:09 +03:00
Alexander Alekhin
d430e802f2 cmdparser: allow empty strings 2015-09-22 16:34:37 +03:00
Alexander Alekhin
12f01b778b fix perf tests 2015-09-22 15:20:40 +03:00
Alexander Alekhin
21e38f2949 Merge pull request #5383 from alalek:fix_tests 2015-09-22 12:11:22 +00:00
Alexander Alekhin
be507b20cd fix perf tests 2015-09-22 15:02:43 +03:00
Vadim Pisarevsky
9f697510ca Merge pull request #5320 from berak:lda_fix 2015-09-22 10:38:46 +00:00
Alexander Alekhin
4bb4c92f68 Merge pull request #5376 from lupustr3:pvlasov/compare_16s_fix 2015-09-22 10:19:52 +00:00
Pavel Vlasov
33e659786f Fix for cmp16s condition during IPP compare type convert; 2015-09-21 18:11:20 +03:00
Alexander Alekhin
d945aff132 Merge pull request #5371 from Dikay900:ports_to_master 2015-09-21 13:52:45 +00:00
Alexander Alekhin
a9b91bb400 Merge pull request #5372 from alalek:cmd_tests 2015-09-21 13:52:26 +00:00
Vadim Pisarevsky
c9ccf3b55d Merge pull request #5346 from art-programmer:art-programmer-patch-1 2015-09-21 12:06:46 +00:00
Vadim Pisarevsky
706828a6d9 Merge pull request #5324 from mshabunin:hal-tests 2015-09-21 12:04:01 +00:00
Vadim Pisarevsky
01345fc159 Merge pull request #5344 from psalvaggio:master 2015-09-21 11:53:41 +00:00
Dikay900
55df326589 PR #4003 2015-09-21 13:44:35 +02:00
Gleb Gladilov
2bc4486966 Added test of minMaxLoc on filling with maximums of int 2015-09-21 13:44:30 +02:00
Gleb Gladilov
344d9fd83f Fixed minMaxLoc and test functions 2015-09-21 13:44:29 +02:00
Vitaly Tuzov
4a0152c731 Resize area result verification moved to the separate function 
fix position of assert expected/actual parameter
 2015-09-21 13:44:28 +02:00
Vitaly Tuzov
7d245e0f29 Added more resize_area tests to ensure right rounding behavior for half and quarter downscaling 2015-09-21 13:44:27 +02:00
Elena Shipunova
5de01fde53 do not proceed with removing zero-length slice 2015-09-21 13:44:26 +02:00
Alexander Alekhin
108bb75430 Merge pull request #5361 from alalek:update_ffmpeg_support 2015-09-21 10:48:42 +00:00
Alexander Alekhin
4613d37eba Merge pull request #5366 from taketwo:use-stream-in-bilateral-filter 2015-09-21 10:47:12 +00:00
Alexander Alekhin
05b1636780 Merge pull request #5329 from paroj:cliparser 2015-09-21 09:46:54 +00:00
berak
2f7c926670 remove usage of obsolete _dataAsRows flag 2015-09-21 07:59:09 +02:00
Suleyman TURKMEN
dff9d2288b Update window_w32.cpp 2015-09-21 00:34:15 +03:00
Alexander Alekhin
d3071db0d7 add some CommandLineParser tests 2015-09-20 13:14:41 +03:00
Andrey Pavlenko
8e088d38a5 draft implementation of alternative CameraBridge via GLES 
a simple sample will look like:

```java
public class MainActivity extends Activity implements CameraGLSurfaceView.CameraTextureListener {

	CameraGLSurfaceView mView;
	ByteBuffer buf;

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        requestWindowFeature(Window.FEATURE_NO_TITLE);
        getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
                WindowManager.LayoutParams.FLAG_FULLSCREEN);
        getWindow().setFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
                WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);

        mView = new CameraGLSurfaceView(this, null);
        mView.setCameraTextureListener(this);
        setContentView(mView);
        buf = ByteBuffer.allocateDirect(1920*1080*4);
    }

    @Override
    protected void onPause() {
        mView.onPause();
        super.onPause();
    }

    @Override
    protected void onResume() {
        super.onResume();
        mView.onResume();
    }

	@Override
	public void onCameraViewStarted(int width, int height) {
		// TODO Auto-generated method stub

	}

	@Override
	public void onCameraViewStopped() {
		// TODO Auto-generated method stub

	}

	@Override
	public boolean onCameraFrame(int texIn, int texOut, int width, int height) {
		Log.i("MAIN", "onCameraFrame");
		int w=width, h=height;
		/*
		// option 1:
		// just return 'false' to display texIn on screen
		retutn false;
		*/

		/*
		// option 2:
		// fast copy texIn to texOut
		GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
    	GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texOut);
		GLES20.glCopyTexImage2D(GLES20.GL_TEXTURE_2D, 0, GLES20.GL_RGBA, 0, 0, w, h, 0);
		return true;
		*/

		// option 3:
		// read, modify and write back pixels
		GLES20.glReadPixels(0, 0, w, h, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);

		buf.rewind();
		// red line
		for(int i=0; i<h; i++) {
			buf.position(w*4*i+i*4);
			buf.put((byte) -1);
			buf.position(w*4*i+i*4+4);
			buf.put((byte) -1);
		}
		buf.rewind();

		GLES20.glActiveTexture(GLES20.GL_TEXTURE0);
    	GLES20.glBindTexture(GLES20.GL_TEXTURE_2D, texOut);
		GLES20.glTexSubImage2D(GLES20.GL_TEXTURE_2D, 0, 0, 0, w, h, GLES20.GL_RGBA, GLES20.GL_UNSIGNED_BYTE, buf);
		return true;
	}
}
```
 2015-09-19 16:18:02 +03:00
Pavel Rojtberg
31da833574 ts/ts_perf: fix wrong has() usage 
`has()` only tests for an argument presence which is always true for
arguments with default values. Use `get<bool>()` to check the value
instead.
 2015-09-18 18:42:14 +02:00
Pavel Rojtberg
96cc618410 has() should only test for the presence of the argument 
and not consider its value. treat arguments with a set default value as
present.
 2015-09-18 18:42:14 +02:00
Pavel Rojtberg
08dd126f08 do not parse empty default values and improve error messages 2015-09-18 18:42:14 +02:00
Alexander Alekhin
0051208684 Merge pull request #5349 from lupustr3:pvlasov/tls_update 2015-09-18 14:39:08 +00:00
Alexander Alekhin
d2b10d8aa1 Merge pull request #5355 from renatoGarcia:master 2015-09-18 13:38:29 +00:00
Alexander Alekhin
1b2c11e7b3 Merge pull request #5343 from paroj:boolean_algebra 2015-09-18 12:06:31 +00:00
Sergey Alexandrov
4094b2d7a5 Use stream argument when launching bilateral filter kernel 2015-09-18 13:12:58 +02:00
Alexander Alekhin
af0942c78f Merge pull request #5335 from Dikay900:ports_to_master 2015-09-18 11:06:08 +00:00
Pavel Rojtberg
f0282337e3 simplify error conditions 
`A || !A` is `true` so write `(A && B) || !A` as `B || !A`
 2015-09-18 12:12:49 +02:00
jisli
f88e9a748a update ffmpeg support 
Migration have been done for these ffmpeg/libav changes:

2013-12-11 - 29c83d2 / b9fb59d,409a143 / 9431356,44967ab / d7b3ee9 - lavc 55.45.101 / 55.28.1 - avcodec.h
  av_frame_alloc(), av_frame_unref() and av_frame_free() now can and should be
  used instead of avcodec_alloc_frame(), avcodec_get_frame_defaults() and
  avcodec_free_frame() respectively. The latter three functions are deprecated.

2012-10-08 - ae77266 / 78071a1 - lavu 51.74.100 / 51.42.0 - pixfmt.h
  Rename PixelFormat to AVPixelFormat and all PIX_FMT_* to AV_PIX_FMT_*.
  To provide backwards compatibility, PixelFormat is now #defined as
  AVPixelFormat.
  Note that this can break user code that includes pixfmt.h and uses the
  'PixelFormat' identifier. Such code should either #undef PixelFormat
  or stop using the PixelFormat name.
 2015-09-17 20:24:37 +03:00
Pavel Vlasov
aa485ccd75 TLS keys leak fix; 
Disables TLS copy constructor and operator, as they can lead to errors and reservation of too much keys in TLS storage;

gather method was added to TLS to gather data from all threads;
 2015-09-17 15:49:20 +03:00
Renato Florentino Garcia
1a18fa1c94 Correct a typo. 2015-09-16 21:16:23 -03:00
art-programmer
e0ef293645 Update em.cpp 
Fix a bug. When reading from a saved model, function decomposeCovs() will be called. And if covMatType is COV_MAT_DIAGONAL, covsEigenValues is computed using SVD and eigen values are sorted so that the order of eigen values is not preserved. This would lead to different result when calling function predict2. This issues is discussed here: http://stackoverflow.com/questions/23485982/got-different-empredict-results-after-emread-saved-model-in-opencv.
 2015-09-14 19:35:53 -05:00
Philip Salvaggio
fcf971bded Improved documentation for connectedComponentsWithStats. 2015-09-14 09:25:32 -04:00
Vadim Pisarevsky
9533982729 Merge pull request #5272 from avershov:opencl-vaapi-fallback 2015-09-14 11:54:20 +00:00
Alexander Alekhin
bf42b9603b fix "unreachable code" warning 2015-09-14 13:11:12 +03:00
Maksim Shabunin
603864dba2 Warning fix 2015-09-14 12:15:56 +03:00
Alexander Alekhin
1a8d7f9587 ocl: temporary restore OpenCL tls data (ocl.cpp without fix) 2015-09-13 20:28:24 +03:00
Alexander Alekhin
7213e5f68a ocl: correct disabling of OpenCL code 2015-09-13 20:28:23 +03:00
Ilya Lavrenov
3143f2fb50 fixed uninitialized memory writing/reading in flann 2015-09-13 12:43:44 +02:00
Ilya Lavrenov
df21a24f81 initialize padding of CvString with zeros 2015-09-13 12:38:10 +02:00
Ilya Lavrenov
ee2008abe8 fixed "Conditional jump or move depends on uninitialised value(s)" in GBD 2015-09-13 12:36:57 +02:00
Ilya Lavrenov
1d77d697ef fixed memory leak in GBTrees 2015-09-13 12:15:30 +02:00
Ilya Lavrenov
cf0f47f589 fixed memory leak in descriptor regression tests 2015-09-13 12:14:30 +02:00
Ilya Lavrenov
f7d36bbad5 fixed memory leaks in modules/features2d/test/test_nearestneighbors.cpp 2015-09-13 12:08:19 +02:00
Ilya Lavrenov
d81a0df489 fixed memory leak caused by illegal memory access 2015-09-11 19:07:20 +02:00
Ilya Lavrenov
e7ac52d17a fixed "Conditional jump or move depends on uninitialised value" warning 2015-09-11 19:03:33 +02:00
Ilya Lavrenov
7e26cf569f typo 2015-09-11 19:01:18 +02:00
Ilya Lavrenov
e390c8c728 fixed typo 2015-09-11 18:59:33 +02:00
Ilya Lavrenov
5547398786 fixed memory leaks in warpAffine tests 2015-09-11 18:47:30 +02:00
Ilya Lavrenov
7eba9055e0 fixed memory leaks in floodfill tests 2015-09-11 18:47:20 +02:00
Ilya Lavrenov
2a8ef1d065 fixed memory leaks in cvtyuv tests 2015-09-11 18:47:11 +02:00
Ilya Lavrenov
0303e8067e fixed memory leak in core ds tests 2015-09-11 18:46:52 +02:00
Ilya Lavrenov
11981c31f0 fixed valgrind warning in polylines 2015-09-11 18:45:01 +02:00
Tsukasa Sugiura
cd13b30fde Fix LineAA in case of 4 channel 
Fix bug when enter 4 channel image to LineAA function.
 2015-09-12 01:42:25 +09:00
Roman Donchenko
ec0508269a NearestNeighborTest: use ts->get_rng() instead of (implicit) theRNG() 
This ensures that test data is not dependent on the order the tests are
executed in.
 2015-09-11 18:39:32 +02:00
Roman Donchenko
a3b515c524 flann: fix AutotunedIndex crashing if a KDTree index is selected 
Backport of mariusmuja/flann@f8ca6df3.
 2015-09-11 18:37:51 +02:00
Roman Donchenko
e1be6d0888 Refactor a section of icvRotatingCalipers to work around a GCC bug 
https://bugs.launchpad.net/ubuntu/+source/gcc-4.9/+bug/1474304
 2015-09-11 18:34:16 +02:00
Maksim Shabunin
a275489f0a HAL universal intrinsics tests and documentation 2015-09-11 18:36:13 +03:00
Alexander Alekhin
190d00ea3e Merge pull request #5317 from alalek:workaround 2015-09-11 11:42:33 +00:00
Maksim Shabunin
31fbe8caeb Merge pull request #5255 from berak:java_videowriter 2015-09-11 11:09:16 +00:00
Alexey Ershov
933ad0e710 changed call to getDefault: false to true in fallback initialization 2015-09-10 14:36:40 +03:00
Maksim Shabunin
d2add41b6b Merge pull request #5321 from alalek:copy_if_different 2015-09-10 09:41:49 +00:00
Maksim Shabunin
0a6e93dd3a Merge pull request #5258 from sturkmen72:patch-6 2015-09-10 09:22:07 +00:00
Alexander Alekhin
ad70ab404c ocl: workaround for getUMat() 2015-09-09 18:56:14 +03:00
Andrey Pavlenko
cea2dafa0f man/unmap, preventing getMat/getUMat from temp object, fix thread-unsafe code in UMat::getMat() 2015-09-09 18:05:29 +03:00
Alexander Alekhin
536634b1fe Merge pull request #5293 from alalek:tapi_custom_ptr_perf 2015-09-09 14:59:17 +00:00
Alexander Alekhin
cdfdf29eca Merge pull request #5292 from alalek:tapi_custom_ptr 2015-09-09 14:58:28 +00:00
Vadim Pisarevsky
32c386786e Merge pull request #5294 from LorenaGdL:master 2015-09-09 13:41:39 +00:00
Vadim Pisarevsky
666de1b087 Merge pull request #5312 from sturkmen72:patch-2 2015-09-09 10:30:22 +00:00
Alexander Alekhin
b15a9d675e cmake: use copy_if_different 2015-09-08 22:42:05 +03:00
Alexey Ershov
5937e58a11 fixed argument in call to {Input|Output}Array.getMat() 2015-09-08 19:29:19 +03:00
Alexey Ershov
949410b347 separated UMat & Mat usage in interop/copy paths 2015-09-07 21:11:05 +03:00
Maksim Shabunin
5618f4a0ac Fixed: Concurrency static scheduler release failed 2015-09-07 18:59:07 +03:00
Suleyman TURKMEN
c63f443bba Update drawing.cpp 
https://github.com/Itseez/opencv/issues/4791
 2015-09-07 11:30:14 +03:00
Suleyman TURKMEN
e15dabf1db documentation patch 2015-09-05 10:41:01 +03:00
Alexey Ershov
68a0347ff9 fallback path & sample timing implemented 
fixed trailing whitespaces
renamed files *vaapi* to *va_intel*
changed names vaapi* to va_intel*
 2015-09-04 02:42:49 +03:00
Alexander Alekhin
4ecc023219 UMat: add perf test for custom ptr 2015-09-03 10:48:07 +03:00
Alexander Alekhin
8694ba0978 update custom_ptr test 2015-09-03 10:46:38 +03:00
Lorena García
4e7bd86fad TrainData doc update 
Update docs according to PR #5127
 2015-09-03 05:52:04 +02:00
Maksim Shabunin
8c65f8a0d1 fixup! Some changes to support mingw-w64 2015-09-01 13:49:23 +03:00
Maksim Shabunin
771af4f32d Some changes to support mingw-w64 
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253)
 2015-09-01 00:59:08 +03:00
Elad Joseph
7c16ad3f49 Update documentation in calib3d.hpp 
Fixed small mistake in documentation.
The prism coefficients in y'' equation were mistakenly written as s1,s2 instead of s3,s4
 2015-08-30 12:42:30 +03:00
Vadim Pisarevsky
a78da45fec Merge pull request #5242 from apavlenko:fix_releasing_temp_umat 2015-08-27 14:29:52 +00:00
Vadim Pisarevsky
bd43c62a75 Merge pull request #5232 from sturkmen72:patch-6 2015-08-27 07:07:53 +00:00
berak
a11ff876d4 enable VideoWriter class for java 
fixing fourcc
 2015-08-27 08:04:58 +02:00
Suleyman TURKMEN
f660461bb3 documentation patch 2015-08-26 17:40:38 +03:00
Andrey Pavlenko
b78eb49178 removing a garbage comment 2015-08-26 14:15:18 +03:00
Andrey Pavlenko
4aefb9f2fc making the test deepper 2015-08-26 13:38:26 +03:00
Alexander Alekhin
bbff288447 fix build with python3 only 2015-08-26 13:08:06 +03:00
Vadim Pisarevsky
b33853c5be Merge pull request #4199 from AVshokurov:master 2015-08-25 18:09:50 +00:00
Vadim Pisarevsky
587b0cc7b4 Merge pull request #4200 from Astero92:#3800 2015-08-25 18:08:54 +00:00
Vadim Pisarevsky
96fa0ef752 Merge pull request #5115 from ManuelFreudenreich:hog_variable 2015-08-25 14:45:53 +00:00
Andrey Pavlenko
3656a1aa66 fixing 'map_unmap_counting' 2015-08-25 17:25:03 +03:00
Vadim Pisarevsky
edcd2c0408 Merge pull request #4176 from alalek:issue_4461 2015-08-25 07:46:28 +00:00
Vadim Pisarevsky
e2b677ddcf Merge pull request #5109 from olumby:fix-cvvideocamera-defaultfps 2015-08-25 07:44:29 +00:00
Vadim Pisarevsky
b6869df556 Merge pull request #5127 from LorenaGdL:data.cpp-(ml-module) 2015-08-25 07:42:41 +00:00
Vadim Pisarevsky
622301c78a Merge pull request #5142 from StevenPuttemans:fix_4230 2015-08-25 07:39:02 +00:00
Andrey Pavlenko
f6b758699b Revert merging of pull request #5176 from vladimir-dudnik:master (reverted from commit 5ee00ec5c6) 2015-08-24 19:22:22 +03:00
Vadim Pisarevsky
bd8bac27d5 Merge pull request #4212 from ludv1x:master 2015-08-24 14:20:54 +00:00
Vadim Pisarevsky
ff8aa6662e Merge pull request #5201 from alalek:move_semantics 2015-08-24 11:05:43 +00:00
Alexander Alekhin
c385ac575d Merge pull request #5238 from LorenaGdL:master 2015-08-24 00:47:01 +00:00
Lorena García
9d01818e8a Small update of Colormap documentation 
Small change in documentation: http://docs.opencv.org/master/d3/d50/group__imgproc__colormap.html#gga9a805d8262bcbe273f16be9ea2055a65a5d4a709cda1130bfa3cc4b4c5ae8f82a&gsc.tab=0

In the enum images, the "parula" colormap has wrongly assigned subtitle 'hot'
 2015-08-23 19:09:15 +02:00
Philippe FOUBERT
b668d3f693 Modification of the related tests in core/tests/ocl 2015-08-22 13:39:34 +02:00
Philippe FOUBERT
0629add3f7 Fix issue #5234 (UMat::convertTo when noScale) 2015-08-22 13:16:59 +02:00
Vitaliy Lyudvichenko
85cc11e3b2 Changed behaviour of Mat/UMat::reshape() to accept n-dim shapes 2015-08-21 19:26:29 +03:00
Alexander Alekhin
b8956d0111 tls: fix access to array (out of bounds) 2015-08-21 16:43:15 +03:00
Alexander Alekhin
44f8670719 Merge pull request #5171 from avershov:opencl-vaapi-interop 2015-08-21 12:47:14 +00:00
Alexey Ershov
a8656ea20f implemented core support & sample 
fixed whitespaces
fixed issues
fixed issue
fixed module statement issues
fixed access mode
added initialization check
fixed warning
 2015-08-21 02:44:03 +03:00
Alexander Alekhin
c1778f1199 Merge pull request #5161 from alalek:fix_string 2015-08-20 12:49:54 +00:00
Maksim Shabunin
4a067dca58 Merge pull request #5154 from brunomorishita:patch-1 2015-08-19 15:22:35 +00:00
Alexander Alekhin
887d8d091b Merge pull request #5177 from lupustr3:pvlasov/tls_fixes 2015-08-19 14:18:19 +00:00
Pavel Vlasov
a33d98c13a TLS memory leaks were fixed; 
TLS was redesigned in more straightforward way;
OPENCV_ABI_COMPATIBILITY define was added;
 2015-08-19 13:31:44 +03:00
thebucc
421e1b237c Fix for bug #5007: moved definition of Size_MatDepth_t and Size_MatDepth from ts_perf.hpp to perf_channels.cpp. This way they are closer to where they are needed and live in a different namespace (possibly the reason why the fix works). 2015-08-17 16:09:00 +01:00
Vladimir Dudnik
58934f1e16 add condition to skip unmapping for internally allocated host memory. this should fix map_unmap_counting UMat test. 2015-08-17 14:36:34 +03:00
Alexander Alekhin
9b0f5e61d1 Merge pull request #5185 from mshabunin:fix-rgbe-header-parse 2015-08-17 10:19:15 +00:00
Alexander Alekhin
e65de8d1da fixes for MSVS compiler optimizer 2015-08-16 02:03:04 +03:00
Alexander Alekhin
ac37b77452 c++ move semantics for cv::UMat 2015-08-16 02:02:26 +03:00
Alexander Alekhin
306aa0e699 c++ move semantics for cv::Mat_ 2015-08-16 02:02:25 +03:00
Alexander Alekhin
1afc9eb730 c++ move semantics for cv::Mat 2015-08-16 02:02:24 +03:00
Alexander Alekhin
5a0af53683 c++ move semantics for cv::Ptr<> 2015-08-15 16:45:19 +03:00
Alexander Alekhin
56cdd6f14f Merge pull request #5116 from lenlen:viz_improvement 2015-08-15 08:28:22 +00:00
Antonella Cascitelli
079ceea616 Added new functionalities to viz module 
- load OBJ file
- set offscreen rendering
- set roll angle of the camera
- get Mat screenshot of the current scene
- remove all lights from the scene
- add a custom light in the scene
- modify the size of the WImage3D widget
- added ambient property for the widget

Changed Vec3d in cv::viz::Color

Renamed method getMatScreenshotin getScreenshot

Modified showWidget

Fixed on viz::Color and reverted fix on vtkProp3D

Removed cameraRoll method

Merged load mesh method (for ply and obj file)

Fixed doc

Fixed cv::viz::WImage3D::setSize for vtk5.8

Fixed enum for cv::viz::Mesh::load
 2015-08-15 01:03:59 +02:00
Alexander Alekhin
e866680d96 Merge pull request #5156 from brunomorishita:fix_build 2015-08-14 13:56:45 +00:00
Alexander Duda
fbcf5f0918 cvCreateCameraCapture: fix using preffered interface 
The provided interface id must be removed from the index. Otherwise, the
underlying implementations are using a wrong camera id.

Example:
VideoCapture(800) fails because PvAPI tries to open a camera
on position 800
 2015-08-14 13:40:24 +02:00
Bruno Goncalves
cf4025c224 fix documentation code formulas 2015-08-13 23:13:47 -03:00
Alexander Alekhin
68f8d1cef0 Merge pull request #5164 from vladimir-dudnik:test-umat-copyTo-issue 2015-08-13 14:59:07 +00:00
Maksim Shabunin
9e4c62967b Fixed RGBE images header parsing (fixes #4885) 2015-08-13 17:24:54 +03:00
boatx
d674965bf9 Fixing typo in variable name. 2015-08-12 20:50:05 +00:00
ManuelFreudenreich
89889ae8ea changed hog to work with variable parameters and changed the hog sample to test it with more options 
added comments and tests
 2015-08-12 09:16:20 +02:00
Vladimir Dudnik
6bb8afde96 fixed typo in OpenCLAllocator.upload method (wrong step used) 2015-08-11 16:01:05 +03:00
Vladimir Dudnik
131d7c394e enabled test UMat copyTo. Now it will detect FAIL on Intel platform for ROI (issue with clEnqueueCopyBufferRect) 2015-08-11 14:19:14 +03:00
Vladimir Dudnik
ef0d1c1c3f fixed download/upload for non contiguous umat 2015-08-11 01:33:46 +03:00
Alexander Alekhin
cda9ed449f fix some functions for valid processing of empty string content (cstr_==0, len_==0) 2015-08-10 18:08:58 +03:00
Alexander Alekhin
09b9b0fb9e Merge pull request #5135 from alalek:issue_4468 2015-08-10 14:46:31 +00:00
Alexander Alekhin
3316e58314 more test loops (and disable tests - tests pass but require a lot of time) 2015-08-10 14:44:28 +03:00
Alexander Alekhin
aed9f5d5e8 Merge pull request #5132 from hewj03:master 2015-08-09 11:27:43 +00:00
Bruno Goncalves
894c2468df fix build error when both OpenNI and OpenNI2 are supported (issue 4918) 2015-08-09 00:48:49 -03:00
Anatoly Baksheev
0dab097a26 minor comment fix 2015-08-07 12:55:10 +03:00
StevenPuttemans
dd8589c352 change as suggested by original programmer and user of ecc software 2015-08-06 14:59:15 +02:00
Alexander Alekhin
8293ed7f9b add tests from issue 4468 (#5062) 2015-08-06 13:50:13 +03:00
Wenju He
67ca143a0b fix adaptiveThreshold mean 2015-08-06 10:23:31 +08:00
Vadim Pisarevsky
4a2aad5bba Merge pull request #4149 from LaurentBerger:ThreshGaussianFloat 2015-08-05 17:25:01 +00:00
Alexander Alekhin
21467d817b tapi: add test from issue 4380 (#5010) 2015-08-05 16:08:48 +03:00
LaurentBerger
a64d096369 remove test 2015-08-04 22:58:22 +02:00
Lorena García
c545857ea6 Indent fix 2015-08-04 16:50:55 +02:00
Lorena García
4cd78bc7ad Whitespace error 2015-08-04 16:45:39 +02:00
Lorena García
fe62243805 Whitespace error 2015-08-04 16:37:41 +02:00
Lorena García
2cb47b4191 Update data.cpp 
Update to allow loading data from a .csv file that only contains training samples values and not the associated responses. To allow this behavior, function must be called with parameters ResponsesStartIdx <= -2 and ResponsesEndIdx = 0
 2015-08-04 15:58:24 +02:00
Vadim Pisarevsky
3f65a86977 Merge pull request #4233 from alalek:fix_4006 2015-08-03 05:46:29 +00:00
Vadim Pisarevsky
c10230f81c Merge pull request #5087 from alexst07:cuda_contrib 2015-08-03 05:42:33 +00:00
Oliver Lumby
2de3a24f46 fix CvVideoCamera defaultfps 2015-08-01 13:55:28 +02:00
Alexander Alekhin
fe0a17e78f fix build with Win7 SDK 2015-07-30 23:23:01 +03:00
Alexander Alekhin
1704aea6a0 tapi: enable some disabled tests 2015-07-30 19:21:24 +03:00
Maksim Shabunin
429d280501 Merge pull request #5081 from sbokov:Adding_HAL_v_extract 2015-07-30 16:12:38 +00:00
Alexander Alekhin
2b2bc83b61 Merge pull request #4238 from vladimir-dudnik:d3d11-nv12-interop 2015-07-30 10:36:25 +00:00
Alex Torres
383b7e9dd1 Fixes namespace error on cudaoptflow 2015-07-29 14:22:45 -03:00
Vladimir Dudnik
6bd01a96d9 finished with NV12 support for D3D11-interop. Now, if texture is in NV12 format then it will be converted to/from BGR UMat. 2015-07-29 19:52:05 +03:00
Vladimir Dudnik
d4774ead43 d3d11-nv12 interop 
fixed issues with ocl nv12 cvt kernel

finisged ocl nv12-to-rgba kernel, update dx-interop samples. (ocl rgba-to-nv12 kernel will be added later)

an attempt to fix build issue

fix for non opencl build issue

fix typo

fix compilation warnings

fix compile issue for Mac (OpenCL)

add convertion from rgba to nv12 (still need to debug kernel)

remove empty line at the EOF

fixed compilation warning
 2015-07-29 19:52:03 +03:00
Alex Torres
2838ccc78e Fixes compilation errors when BUILD_CUDA_STUBS is ON 2015-07-29 08:59:38 -03:00
Alexander Alekhin
4eef486afe tapi: datarace fixup for cvtColor 2015-07-28 11:49:46 +03:00
Alexander Alekhin
9bcccb028b fixes 2015-07-28 11:49:46 +03:00
Alexander Alekhin
cd5c70691a ocl: add map tests 2015-07-28 11:49:46 +03:00
Alexander Alekhin
b36f565d13 fix OpenCV code (bug 4006: #4862) 2015-07-28 11:49:41 +03:00
Vladimir Dudnik
ed7907e46c add test for bug 4006: #4862 2015-07-28 11:49:02 +03:00
sbokov
1ef8cf5a23 Replacing SSE with v_extract 2015-07-27 19:49:25 +03:00
Alexander Alekhin
47e7a7a7ce Merge pull request #4213 from mshabunin:hal-vextq 2015-07-27 15:08:29 +00:00
Alexander Alekhin
c94945f892 Merge pull request #4210 from wangyan42164:ocl_umat_convert 2015-07-27 15:05:57 +00:00
Maksim Shabunin
6b8e13d017 Merge pull request #4232 from berak:patch-2 2015-07-27 08:15:11 +00:00