Vadim Pisarevsky
6f2fb383e6
Merge pull request #5359 from StevenPuttemans:contributing_guidelines_2.4
2015-09-21 11:53:06 +00:00
Alexander Alekhin
44ab680613
Merge pull request #5341 from blebo:py3compat
2015-09-21 11:47:26 +00:00
Vadim Pisarevsky
ddf220e136
Merge pull request #5358 from StevenPuttemans:contributing_guidelines_master
2015-09-21 11:45:29 +00:00
Dikay900
32a4ec156b
changes to reflect 3.0 status
2015-09-21 13:44:39 +02:00
Roman Donchenko
2eab5eb6c0
Only conflict with packages corresponding to modules that are built
2015-09-21 13:44:38 +02:00
Roman Donchenko
7749eb5d1f
Add missing packages to the Debian conflict list
...
And refactor the code to make sure that the dev and runtime package lists are
in sync.
2015-09-21 13:44:37 +02:00
Alexander Smorkalov
bd5a222d84
Debian packages header update to fix conflict with OpenCV from deb repo.
2015-09-21 13:44:36 +02:00
Alexander Smorkalov
c7bfdc2063
Added explicit deb package dependency from libtbb-dev if TBB is enabled.
2015-09-21 13:44:36 +02:00
Dikay900
55df326589
PR #4003
2015-09-21 13:44:35 +02:00
Vladislav Vinogradov
6282ff0887
exclude dates from report names
2015-09-21 13:44:34 +02:00
Vladislav Vinogradov
ea35fee5b8
save tests console output to separate log files
2015-09-21 13:44:33 +02:00
Vladislav Vinogradov
0e5fec288c
check that current directory has write access
2015-09-21 13:44:32 +02:00
Roman Donchenko
c0cc51cb4b
Add ARM64 packaging support
2015-09-21 13:44:31 +02:00
Roman Donchenko
5dd76a4791
Set CPACK_DEBIAN_PACKAGE_ARCHITECTURE instead of CPACK_DEBIAN_ARCHITECTURE
...
Because that's the variable actually used by CPack.
2015-09-21 13:44:30 +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
e1b0d341e4
Merge pull request #5360 from SpecLad:test2-fail-on-failed-download
2015-09-18 12:10:52 +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
Roman Donchenko
08ad3b500b
test2.py: switch from urllib to urllib2
...
urllib2 raises an exception if an HTTP request produces an error code,
making the test fail earlier.
2015-09-17 18:24:30 +03:00
Roman Donchenko
56f17e4921
test2.py: fail if a downloaded image can't be decoded
2015-09-17 18:17:06 +03:00
Roman Donchenko
293ea03dcc
test2.py: remove unused imports
2015-09-17 18:14:49 +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
StevenPuttemans
e9037644c3
add link to contributing guidelines
2015-09-17 14:15:20 +02:00
StevenPuttemans
bef1b5322e
add link to contributing guidelines
2015-09-17 14:14:21 +02:00
Renato Florentino Garcia
1a18fa1c94
Correct a typo.
2015-09-16 21:16:23 -03:00
Hajo Nils Krabbenhöft
7825cbeb7d
buffer_size should be in bytes, not bits
2015-09-16 22:19:51 +02:00
Hajo Nils Krabbenhöft
d38fee7599
fix crash for large BW tif images
2015-09-16 22:04:42 +02: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
Vadim Pisarevsky
fb4b4cbf58
Merge pull request #5334 from UnaNancyOwen:fix2_LineAA
2015-09-14 11:49:48 +00:00
