Alexander Alekhin
750162acb3
move IPPICV binaries to GitHub opencv_3rdparty repository
2015-09-25 16:50:50 +03:00
Dikay900
274b361ca3
proposed change by psyill
2015-09-12 12:19:44 +02:00
Ashley Stacey
d8d78b4a98
Fix pdb file generation on Windows for CMake versions after 3.1.0.
...
Pdb file support was changed in CMake 2.8.12, support was added in CMake 3.1.0 to work around the problems created by the change introduced in CMake 2.8.12.
2015-08-17 10:28:22 +10:00
Maksim Shabunin
ef16650f5c
Android SDK build Initial
2015-08-12 11:31:35 +03:00
Maksim Shabunin
14d7b38613
Fixing GCC 4.9 warnings
2015-07-22 16:12:31 +03:00
Alexander Alekhin
56ad207d37
update ffmpeg wrapper binaries
...
Scripts are updated for Linux-based (Ubuntu 14.04) mingw cross-compilation (full stack of scripts provided)
Part of these scripts may work under Windows installation of MinGW, but it is not supported.
FFMPEG update: 2.7.1
Added OpenH264 Cisco binaries support for H264 encoding: v1.4.0
2015-07-03 19:13:15 +03:00
Alexander Alekhin
ca8312b0b3
remove legacy intermediate unused files
2015-07-01 16:46:54 +03:00
Maksim Shabunin
7ee79b73f6
AndroidMgr: fixed package build
2015-06-03 19:01:48 +03:00
Vadim Pisarevsky
2b2e3ee93c
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
2015-04-22 21:57:29 +03:00
Vadim Pisarevsky
052593c760
1. Input/OutputArray optimizations;
...
2. Algorithm::load/save added (moved from StatModel)
3. copyrights updated; added copyright/licensing info for ffmpeg
4. some warnings from Xcode 6.x are fixed
2015-04-07 16:44:26 +03:00
Ashod Nakashian
54ab3137d5
Simplified temp filename generation.
2015-04-03 21:01:44 -04:00
Ashod Nakashian
6fd2fdc2e6
Jasper unit-tests and removed a superfluous assertion.
2015-04-03 21:01:43 -04:00
Ashod Nakashian
03ea24f298
Fix for decoding large Jp2 images on Windows.
...
On Windows, the tmpnam function returns a temp filename in the current directory, which has a prepended backslash '\\'.
This subsequently fails the open function.
This patch creates a proper temp filename in the temp folder and makes unlike work by opening the file as short-lived.
2015-04-03 21:01:42 -04: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
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
Ilya Lavrenov
c5a80193a8
aarch64 support
2015-02-26 19:43:32 +03:00
Andrey Kamaev
9582c33eab
Fix build for Android arm64-v8a
2014-12-09 12:06:56 +03:00
Alexander Alekhin
5d213582f7
update IPPICV package
2014-11-05 13:26:23 +03:00
Maksim Shabunin
571ebb2373
Fixing iOS clang warnings, part 3
2014-10-17 18:15:21 +04:00
Vadim Pisarevsky
9a58b1a3a0
Merge pull request #2925 from BloodAxe:osx-framework-script
2014-07-19 18:04:15 +00:00
vbystricky
4286f60387
Extract imgcodecs module from highgui
2014-07-07 16:28:08 +04:00
Ievgen Khvedchenia
92ead5fab3
Fix cmake to build OpenCV framework on OSX
2014-07-01 22:31:57 +03:00
Alexander Alekhin
0f7fbe4458
icv: enable public IPPICV packages
2014-05-23 13:43:31 +04:00
Alexander Alekhin
6f798b1ba7
icv: android x86 build
2014-05-13 18:28:13 +04:00
Alexander Alekhin
5658ba0002
icv: update package
2014-04-29 15:35:27 +04:00
Alexander Alekhin
047d285b7d
ICV: added package downloader
2014-04-11 14:19:18 +04:00
Roman Donchenko
e055b68ceb
Merge pull request #2403 from hbristow:issue-3451
2014-03-28 12:13:14 +04:00
Roman Donchenko
cc05493730
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectAndroidSDK.cmake
cmake/OpenCVGenAndroidMK.cmake
cmake/OpenCVModule.cmake
cmake/templates/OpenCV.mk.in
cmake/templates/OpenCVConfig.cmake.in
doc/tutorials/imgproc/histograms/histogram_comparison/histogram_comparison.rst
modules/cudabgsegm/src/cuda/mog.cu
modules/imgproc/perf/opencl/perf_filters.cpp
modules/imgproc/src/opencl/filterSep_singlePass.cl
modules/nonfree/CMakeLists.txt
modules/nonfree/perf/perf_precomp.hpp
modules/ocl/perf/perf_haar.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/opencl/bgfg_mog.cl
modules/superres/CMakeLists.txt
modules/superres/src/btv_l1_cuda.cpp
modules/superres/src/cuda/btv_l1_gpu.cu
modules/superres/src/frame_source.cpp
modules/superres/src/input_array_utility.cpp
modules/superres/src/optical_flow.cpp
modules/superres/src/precomp.hpp
samples/gpu/CMakeLists.txt
samples/gpu/brox_optical_flow.cpp
samples/gpu/super_resolution.cpp
2014-03-24 19:02:16 +04:00
Alexander Smorkalov
0dba5bdc4a
Multiple fixes in camera.
...
Fixed constant value for focus mode FOCUS_MODE_CONTINUES_PHOTO;
Add setters and getters for exposure lock and white balance lock flags;
Excluded camera restart for all setters except frame size.
2014-03-21 17:26:05 +04:00
Alexander Smorkalov
846266fde4
Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4.
2014-03-21 14:16:03 +04:00
Hilton Bristow
72d5609a36
Merged upstream master
2014-03-04 11:14:03 +10:00
Roman Donchenko
029ffb7c2d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/src/gl_core_3_1.cpp
modules/core/src/opencl/convert.cl
modules/cudaimgproc/src/cuda/canny.cu
modules/cudastereo/perf/perf_stereo.cpp
modules/gpu/perf/perf_imgproc.cpp
modules/gpu/test/test_denoising.cpp
modules/ocl/src/opencl/imgproc_resize.cl
samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +04:00
Stuart Cunningham
1454843b81
Fix build of libtiff on big endian host due to defined but empty WORDS_BIGENDIAN macro
2014-02-14 16:16:17 +11:00
Stuart Cunningham
55b9c0374c
Fix cmake detection of build platform endianness
...
Improve comments to indicate actual usage of WORDS_BIGENDIAN where
it is tested with #ifdef rather than #if
2014-02-13 22:59:30 +11:00
Stuart Cunningham
8bbce0a2a2
Fix reading of 16-bit TIFF images on big endian host.
...
Use correct integer types for arguments to TIFFGetField to avoid corruption
of values and failed loads of TIFF file when using cv::imread().
Added test where both big and little endian TIFF files are read using imread().
Fixed build of 3rdparty libtiff on big endian hosts.
Reduced memory required during decode_tile16384x16384 test by not converting
large grayscale test image to color image during read.
2014-02-12 21:21:06 +11:00
Roman Donchenko
bbc35d609d
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
cmake/OpenCVDetectPython.cmake
cmake/OpenCVModule.cmake
modules/core/src/gpumat.cpp
modules/cudaimgproc/test/test_hough.cpp
modules/gpu/CMakeLists.txt
modules/gpu/src/cuda/generalized_hough.cu
modules/gpu/src/generalized_hough.cpp
modules/python/CMakeLists.txt
2014-01-27 15:28:14 +04:00
Alexander Smorkalov
b75cbfde45
All installed files marked with component names for install customization.
2014-01-21 20:34:36 +04:00
Roman Donchenko
e45fd939c2
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
2014-01-20 15:10:19 +04:00
Dinar Valeev
711f07a34c
Use __vector instead of vector as suggests Eigen
...
This fixes build on PowerPC where Eigen unsets vector, bool and pixel
Signed-off-by: Dinar Valeev <dvaleev@suse.com>
2014-01-16 21:53:49 +01:00
ahb
49dfa5a17f
Fix the following error for ocl::getOpenCLPlatforms() on Ubuntu 12.04 with gcc 4.8
...
OpenCV Error: Unknown error code -6 (OpenCL function is not available: [clGetPlatformIDs]) in opencl_check_fn, file /home/ahb/software/opencv/modules/ocl/src/cl_runtime/cl_runtime.cpp, line 83
The issue results from modules/ocl/src/cl_runtime/cl_runtime.cpp checking for
"linux" instead of "__linux__" (cp. http://sourceforge.net/p/predef/wiki/OperatingSystems/ )
Adjust all other occurrences of "defined(linux)" as well.
2014-01-13 16:09:42 +01:00
Roman Donchenko
9dfb96389c
Merge commit '4b885e206' into merge-2.4
2013-12-30 16:48:45 +04:00
Hilton Bristow
7cad2c6788
fixed relative imports in Jinja for python3
2013-12-29 17:10:52 +10:00
Andrey Pavlenko
734bf8babd
removing legacy stuff
2013-12-26 15:49:12 +04:00
Roman Donchenko
464a010f53
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/operations.hpp
modules/core/include/opencv2/core/version.hpp
modules/core/src/gpumat.cpp
modules/cudaimgproc/src/color.cpp
modules/features2d/src/orb.cpp
modules/imgproc/src/samplers.cpp
modules/ocl/include/opencv2/ocl/matrix_operations.hpp
modules/ocl/include/opencv2/ocl/ocl.hpp
samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
Roman Donchenko
d8a4d3a2eb
Merge pull request #1921 from SpecLad:defined-msc-ver
2013-12-04 15:46:56 +04:00
Roman Donchenko
11c7053b0f
Fixed a -Wundef warning in cl_platform.h.
...
_MSC_VER -> defined _MSC_VER. Fixes building with MinGW.
Similar to fbc91c5ee
.
2013-12-04 12:39:20 +04:00
Roman Donchenko
d58cd9851f
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
CMakeLists.txt
cmake/OpenCVDetectCUDA.cmake
doc/tutorials/features2d/feature_flann_matcher/feature_flann_matcher.rst
modules/core/src/cmdparser.cpp
modules/gpu/CMakeLists.txt
modules/gpu/doc/introduction.rst
modules/gpu/perf/perf_video.cpp
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/ocl/src/cl_context.cpp
modules/video/include/opencv2/video/background_segm.hpp
samples/cpp/image_sequence.cpp
samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
samples/python/chessboard.py
samples/python/cvutils.py
samples/python/demhist.py
samples/python/dft.py
samples/python/distrans.py
samples/python/edge.py
samples/python/ffilldemo.py
samples/python/fitellipse.py
samples/python/houghlines.py
samples/python/inpaint.py
samples/python/logpolar.py
samples/python/morphology.py
samples/python/numpy_array.py
samples/python/watershed.py
2013-12-03 17:35:21 +04:00
Andrey Pavlenko
b5dbe9e04b
Added patch from master for fixing VS2013 in 3rd party lib OpenEXR
2013-12-03 16:08:57 +04:00
Alexander Smorkalov
a13db7c8fa
Android native camera destruction fixed for Android 4.4.
2013-11-29 10:38:26 +04:00
Roman Donchenko
9c2272d520
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Conflicts:
.gitignore
CMakeLists.txt
doc/CMakeLists.txt
modules/calib3d/src/stereosgbm.cpp
modules/core/include/opencv2/core/mat.hpp
modules/highgui/src/cap_openni.cpp
modules/ml/include/opencv2/ml/ml.hpp
modules/objdetect/src/hog.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/filtering.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/optical_flow_farneback.cpp
platforms/scripts/camera_build.conf
platforms/scripts/cmake_android_all_cameras.py
samples/cpp/Qt_sample/main.cpp
samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
2013-11-26 15:05:26 +04:00