opencv

Open Source Computer Vision Library https://opencv.org/

Alexander Alekhin e845184843 Merge remote-tracking branch 'upstream/2.4' into merge-2.4 * #1538 An error occurred from StevenPuttemans:bugfix_3283 * #1545 An error occurred from alalek:ocl_test_fix_rng * #1551 An error occurred from alalek:cmake_install_win * #1570 An error occurred from ilya-lavrenov:ipp_warn_fix * #1573 An error occurred from alalek:perf_simple_strategy * #1574 An error occurred from alalek:svm_workaround * #1576 An error occurred from alalek:ocl_fix_cl_double * #1577 An error occurred from ilya-lavrenov:ocl_setto_opencl12 * #1578 An error occurred from asmorkalov:android_fd_cp_fix * #1579 An error occurred from ilya-lavrenov:ocl_norm * #1582 An error occurred from sperrholz:ocl-arithm-additions * #1586 An error occurred from ilya-lavrenov:ocl_setto_win_fix * #1589 An error occurred from ilya-lavrenov:pr1582_fix * #1591 An error occurred from alalek:ocl_remove_cl_hpp_h * #1592 An error occurred from alalek:ocl_program_cache_update * #1593 An error occurred from ilya-lavrenov:ocl_war_on_double * #1594 An error occurred from ilya-lavrenov:ocl_perf * #1595 An error occurred from alalek:cl_code_cleanup * #1596 An error occurred from alalek:test_fix_run_py * #1597 An error occurred from alalek:ocl_fix_cleanup * #1598 An error occurred from alalek:ocl_fix_build_mac * #1599 An error occurred from ilya-lavrenov:ocl_mac_kernel_warnings * #1601 An error occurred from ilya-lavrenov:ocl_fix_tvl1_and_sparse * #1602 An error occurred from alalek:ocl_test_dump_info * #1603 An error occurred from ilya-lavrenov:ocl_disable_svm_noblas * #1605 An error occurred from alalek:ocl_fixes * #1606 An error occurred from ilya-lavrenov:ocl_imgproc * #1607 An error occurred from ilya-lavrenov:ocl_fft_cleanup * #1608 An error occurred from alalek:fix_warn_upd_haar * #1609 An error occurred from ilya-lavrenov:ocl_some_optimization * #1610 An error occurred from alalek:ocl_fix_perf_kalman * #1612 An error occurred from alalek:ocl_fix_string_info * #1614 An error occurred from ilya-lavrenov:ocl_svm_misprint * #1616 An error occurred from ilya-lavrenov:ocl_cvtColor * #1617 An error occurred from ilya-lavrenov:ocl_info * #1622 An error occurred from a0byte:2.4 * #1625 An error occurred from ilya-lavrenov:to_string Conflicts: cmake/OpenCVConfig.cmake cmake/OpenCVDetectPython.cmake cmake/OpenCVGenConfig.cmake modules/core/CMakeLists.txt modules/nonfree/src/surf.ocl.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/include/opencv2/ocl/private/util.hpp modules/ocl/perf/main.cpp modules/ocl/src/arithm.cpp modules/ocl/src/cl_operations.cpp modules/ocl/src/cl_programcache.cpp modules/ocl/src/color.cpp modules/ocl/src/fft.cpp modules/ocl/src/filtering.cpp modules/ocl/src/gemm.cpp modules/ocl/src/haar.cpp modules/ocl/src/imgproc.cpp modules/ocl/src/matrix_operations.cpp modules/ocl/src/pyrlk.cpp modules/ocl/src/split_merge.cpp modules/ocl/src/svm.cpp modules/ocl/test/main.cpp modules/ocl/test/test_fft.cpp modules/ocl/test/test_moments.cpp modules/ocl/test/test_objdetect.cpp modules/ocl/test/test_optflow.cpp modules/ocl/test/utility.hpp modules/python/CMakeLists.txt modules/ts/include/opencv2/ts.hpp modules/ts/src/ts_perf.cpp samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp		12 years ago
..
src2	Merge pull request #1474 An error occurred from f-morozov:for_pr	12 years ago
test	Merge commit '43aec5ad' into merge-2.4	12 years ago
CMakeLists.txt	Merge remote-tracking branch 'upstream/2.4' into merge-2.4	12 years ago