Ashod Nakashian
f75f2ffd48
Jpeg2k color to greyscale conversion on non-Windows is done post decoding because system libjasper segfaults when decoding color images as greyscale.
2015-04-03 21:01:45 -04:00
Ashod Nakashian
6fd2fdc2e6
Jasper unit-tests and removed a superfluous assertion.
2015-04-03 21:01:43 -04:00
Andrey Pavlenko
ed9f933d41
fixing confusing variable naming in a sample code
2015-04-03 14:03:09 +03:00
Maxim Kostin
412a2aa4ab
Added support for 'imgcodecs' module:
...
- Resolved GET_ENV and input type incompatibility
- Made libjpeg compile for WINRT. So does imgcodecs module.
- Updated .gitignore (log, tlog)
2015-03-31 16:31:37 +03:00
Vadim Pisarevsky
6820292256
Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib
2015-03-03 12:52:03 +00:00
Maxim Kostin
cdd23440c9
Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1
...
- Substituted HAVE_WINRT with WINRT
- Fixed compilation issues in ocl.cpp and parallel.cpp
- Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore
- Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp
- Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c;
- Added ole32.lib for core module (for WindowsStore 8.0 builds)
- Made OpenCV_ARCH aware of ARM
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:43 +03:00
Maksim Shabunin
37c74e38f4
Python support
2015-03-02 18:13:00 +03:00
Maksim Shabunin
457123027e
Modified java wrapping mechanism
2015-03-02 18:12:30 +03:00
Eric Sommerlade
998a909705
fixed whitespace issues
2015-02-23 08:15:34 -07:00
Eric Sommerlade
a07d7a70a0
added support for uncompressed parameters to tiff image format as described here: expertland.net/question/b6o3n6p9a72341db823b48nl98m91dx8n1/detail.html
2015-02-23 06:12:42 -07:00
UQ Times
1944443d10
iOS: fix crash from overrelease in UIImageToMat
...
- previous pull request: https://github.com/Itseez/opencv/pull/3340
2015-02-18 13:30:08 +09:00
Maksim Shabunin
036b13ee05
Fixed GDAL loader check
2015-01-21 14:01:21 +03:00
Maksim Shabunin
1a15596f21
Fixed build warning in GDAL support module
2015-01-21 12:53:50 +03:00
Vadim Pisarevsky
f647054c8c
Merge pull request #3616 from marvins:gdal-fixes
2015-01-20 12:31:14 +00:00
Marvin Smith
9a0e038a48
Fixed compile warning from redefined macro.
2015-01-17 20:37:51 -08:00
Marvin Smith
91fbe00caa
Updated gdal tutorial to include comments.
2015-01-17 19:28:58 -08:00
Marvin Smith
9a1a9d9aff
Updating CMake to get GDAL working again on OS X.
2015-01-17 16:59:56 -08:00
Vladislav Vinogradov
c120001178
fix -Wsign-compare warnings
2015-01-15 17:17:35 +03:00
Ashod Nakashian
473964806c
Added imread and imreadmulti regression tests.
2015-01-03 12:48:29 -05:00
Ashod Nakashian
61ca38103c
Added imreadmulti API to read multi-paged images into a vector of Mat.
2015-01-03 00:09:35 -05:00
Ashod Nakashian
ecf359b8c9
Support for multipage decoding in BaseImageDecoder and implemented in TiffDecoder.
2015-01-03 00:09:34 -05:00
Vadim Pisarevsky
1c8493fb0d
Merge pull request #3549 from mshabunin:sphinx-doc-remove
2014-12-31 09:14:22 +00:00
Julien Nabet
2d5e3b57ea
Fix cppcheck reports warnings:
...
(performance) Possible inefficient checking for 'lmap' emptiness
(warning) Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
(style) Array index '<xxx>' is used before limits check
2014-12-27 10:54:34 +01:00
Maksim Shabunin
d01bedbc61
Removed Sphinx documentation files
2014-12-26 19:12:19 +03:00
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
2014-12-01 15:50:36 +03:00
Maksim Shabunin
dcae7698ad
Doxygen documentation for: highgui, video, imgcodecs and videoio
2014-12-01 15:47:13 +03:00
Maksim Shabunin
e85ae5f2f0
Fixed imgcodecs tests
...
- Imgcodecs_Image, write_imageseq - assuming JPEG images have losses
- Imgcodecs_Drawing, c_regression - replaced assert calls
- Imgcodecs_Drawing - exact comparison with reference image
2014-10-23 12:38:42 +04:00
Maksim Shabunin
571ebb2373
Fixing iOS clang warnings, part 3
2014-10-17 18:15:21 +04:00
Maksim Shabunin
420737e098
Fixing iOS clang warnings, part 1
2014-10-17 18:14:54 +04:00
Maksim Shabunin
630eddf25a
Extracted repeated cmake instruction block
2014-10-17 18:14:53 +04:00
Alexander Alekhin
d47a2988a9
Merge pull request #3128 from asmorkalov:android_tegra_optimizations_build_fix
2014-08-21 15:48:10 +00:00
Alexander Smorkalov
f38ebba34d
Build fix for NVIDIA Tegra optimizations integration.
2014-08-19 11:40:25 +04:00
Vadim Pisarevsky
e9729a9601
multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics
2014-08-16 00:29:10 +04:00
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
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
Adil Ibragimov
98d5731ad8
some formal changes (generally adding constness)
2014-08-07 15:49:14 +04:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
Vadim Pisarevsky
a782ee93de
Merge pull request #2992 from snikulov:upmerge_jpeg_tweak
2014-07-30 12:48:41 +00:00
Sergei Nikulov
eaec132091
#2992 : update after review
2014-07-30 00:03:41 +04:00
Kobi Gurkan
6cac76bfe4
fixes tab indentation - replacing with 4 spaces
2014-07-27 17:14:54 +03:00
Kobi Gurkan
fc8f0e341b
adding support for 16-bit 4 channel tiffs
...
- when IMREAD_UNCHANGED is set in flags, the tiff is read with 4 channels
- adding test for read/write
2014-07-27 17:09:05 +03:00
Sergey Nikulov
9d107fb2d5
fixed test compilation
2014-07-21 19:26:26 +04:00
Sergey Nikulov
bd144cfa64
upmerged pull req #2974 to master - added more jpeg options to imgcodecs
2014-07-21 18:56:35 +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