Vadim Pisarevsky
|
a602185fb6
|
Merge pull request #3097 from mshabunin:gdal-support
|
2014-08-13 19:26:10 +00:00 |
|
mshabunin
|
3ed89a8879
|
Merge with master and fix conflicts
|
2014-08-13 18:24:11 +04:00 |
|
Adil Ibragimov
|
8a4a1bb018
|
Several type of formal refactoring:
1. someMatrix.data -> someMatrix.prt()
2. someMatrix.data + someMatrix.step * lineIndex -> someMatrix.ptr( lineIndex )
3. (SomeType*) someMatrix.data -> someMatrix.ptr<SomeType>()
4. someMatrix.data -> !someMatrix.empty() ( or !someMatrix.data -> someMatrix.empty() ) in logical expressions
|
2014-08-13 15:21:35 +04:00 |
|
Roman Donchenko
|
983e75e5de
|
Merge remote-tracking branch 'origin/master' into merge-2.4
|
2014-08-01 15:01:41 +04:00 |
|
vbystricky
|
d58f736935
|
Split highgui module to videoio and highgui
|
2014-07-14 23:16:47 +04:00 |
|
vbystricky
|
4286f60387
|
Extract imgcodecs module from highgui
|
2014-07-07 16:28:08 +04:00 |
|