mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 19:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
e45fd939c2
opencv/3rdparty/libtiff
History
Alexander Alekhin e845184843 Merge remote-tracking branch 'upstream/2.4' into merge-2.4 
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 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
2013-10-15 20:08:52 +04:00
..
ChangeLog Update libtiff to release v4.0.2 2012-08-30 00:23:45 +04:00
CMakeLists.txt Merge remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +04:00
COPYRIGHT Update libtiff to release v4.0.2 2012-08-30 00:23:45 +04:00
t4.h updated libtiff: from 3.9.5 to 4.0.1 #1609 2012-02-29 15:01:28 +00:00
tif_aux.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_close.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_codec.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_color.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_compress.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_config.h.cmakein Normalized file endings. 2013-08-21 18:59:25 +04:00
tif_dir.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_dir.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_dirinfo.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_dirread.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_dirwrite.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_dumpmode.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_error.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_extension.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_fax3.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_fax3.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_fax3sm.c updated 3rd party libs: CLapack 3.1.1.1 => 3.2.1, zlib 1.2.3 => 1.2.5, libpng 1.2.x => 1.4.3, libtiff 3.7.x => 3.9.4. fixed many 64-bit related VS2010 warnings 2010-07-16 12:54:53 +00:00
tif_flush.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_getimage.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_jbig.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_jpeg_12.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_jpeg.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_luv.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_lzma.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_lzw.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_next.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_ojpeg.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_open.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_packbits.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_pixarlog.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_predict.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_predict.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_print.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_read.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_stream.cxx Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_strip.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_swab.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_thunder.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_tile.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_unix.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_version.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_warning.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_win32.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_write.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tif_zip.c Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tiff.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tiffio.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tiffio.hxx Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tiffiop.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
tiffvers.h Update libtiff to release v4.0.2 2012-08-30 00:23:45 +04:00
uvcode.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00