Commit Graph

8065 Commits

Author SHA1 Message Date
siddharth 573e818415 New changes done and removed opencv_extra folder
Removed opencv_extra folder inside opencv folder

New changes done

Removed test images
2013-12-04 19:18:00 +05:30
siddharth 33e6c07485 Removed build errors and removed test images
Removed conflict

Error fix 1

Error fix 2

Error fix 3

Error fix 3

Error fix 4

Error fix 5

Error fix 6

Error fix 7

Error fix 8

Error fix 9

Error fix 10

Error fix 11

Error fix 12

Errors fixed

Removed opencv_extra folder inside opencv folder
2013-12-04 19:18:00 +05:30
siddharth 2f65a0d4ba Changes done in npr module 2013-12-04 19:18:00 +05:30
siddharth 35d9ca6483 Changes done in cloning module 2013-12-04 19:18:00 +05:30
siddharth daa9694cab Changes done in decolorization module 2013-12-04 19:17:59 +05:30
siddharth 94eab9babe Revert Back 2013-12-04 19:17:59 +05:30
siddharth 6c7272bde1 Update to remove Android error 2013-12-04 19:17:59 +05:30
siddharth 3b239561c6 Changed STL in contrast_preserve file 2013-12-04 19:17:59 +05:30
siddharth f85a615f3f whitespaces removed and other minor changes to fix build error
Update 1

update 2

Update 3

Update 4

Update 5

update 6

Update 7

Update 8

Update 9

Update 10

Update 11

Update 12

Update 13

Update 14

Update 15

Update 16

Update 17

Update 18

Update 19

Update 20

Update 21

Update 22

Removed Headers

Update 23

Update 24

Update 25

Update 26

Update 27

Update 28
2013-12-04 19:17:59 +05:30
siddharth 56ab1c18e6 new filters added and all the 3 modules updated
All 3 modules Updated
2013-12-04 19:17:58 +05:30
siddharth ae9b4003ae edge preserve filters added and windows warning removed
update1
2013-12-04 19:17:58 +05:30
siddharth 1ed0e44090 added keyboard control 2013-12-04 19:17:58 +05:30
siddharth e170115ad0 new interface added. decolor and cloning module added.
Both modules added
2013-12-04 19:17:58 +05:30
siddharth 5b0ee9e085 decolor module updated 2013-12-04 19:17:58 +05:30
siddharth 0802c06571 seamless cloning added
update1

update1

update4
2013-12-04 19:17:58 +05:30
siddharth a1b3ba02a7 add color_boost + doc 2013-12-04 19:17:58 +05:30
siddharth 88aa4a9902 decolor module updated
update3

update4

update4

update5

added test data
2013-12-04 19:17:58 +05:30
siddharth 95db69f6b9 added new files 2013-12-04 19:17:58 +05:30
Roman Donchenko 0736ede7e5 Merge pull request #1914 from SpecLad:merge-2.4 2013-12-04 16:30:57 +04:00
Andrey Pavlenko f9190cc662 Merge pull request #1909 from alalek:ocl_tapi_perf 2013-12-04 11:35:11 +04:00
Andrey Pavlenko e585f145f6 Merge pull request #1903 from ilya-lavrenov:tapi_warp 2013-12-04 11:34:52 +04:00
Ilya Lavrenov 49474903cb refactoring 2013-12-04 00:51:55 +04:00
Ilya Lavrenov 49e729f89d ability to use cv::PSNR with transparent cv::norm 2013-12-04 00:51:55 +04:00
Ilya Lavrenov 88bceb5060 added cv::meanStdDev to T-API 2013-12-04 00:51:55 +04:00
Ilya Lavrenov b8edc2cc4d added cv::sum to T-API 2013-12-04 00:51:43 +04:00
Ilya Lavrenov 28575c1969 added cv::countNonZero to T-API 2013-12-04 00:51:32 +04:00
Ilya Lavrenov fed7e61879 added cv::repeat to T-API (fix for copyTo -> UMat is needed) 2013-12-04 00:50:03 +04:00
Ilya Lavrenov e17107e864 added cv::compare to T-API 2013-12-04 00:50:03 +04:00
Ilya Lavrenov a180cebb2d added cv::polarToCart to T-API 2013-12-04 00:50:03 +04:00
Ilya Lavrenov ba850f0b64 added cv::cartToPolar to T-API 2013-12-04 00:50:03 +04:00
Ilya Lavrenov 435028ccee added cv::transpose to T-API 2013-12-04 00:50:03 +04:00
Ilya Lavrenov 6ab297718d added setIdentity to T-API 2013-12-04 00:50:03 +04:00
Ilya Lavrenov 3e586f42a0 added cv::pow to T-API 2013-12-04 00:50:02 +04:00
Ilya Lavrenov 997ec60839 added OCL-TAPI arithm tests 2013-12-04 00:50:02 +04:00
Ilya Lavrenov 803672feea added cv::remap to T-API 2013-12-04 00:43:43 +04:00
Ilya Lavrenov dcce9d7088 added cv::warpAffine to T-API 2013-12-04 00:43:43 +04:00
Ilya Lavrenov 55af7857b9 added cv::warpPerspective to T-API 2013-12-04 00:43:42 +04:00
Alexander Alekhin 7d9150460a core/ocl: added perf test infra + "Add" perf test 2013-12-03 18:43:50 +04:00
Alexander Alekhin fe01bc21c0 perf: test-based metrics collection strategy 2013-12-03 18:43:50 +04:00
Roman Donchenko 90c230678e Merge pull request #1912 from KonstantinMatskevich:ocl_tapi_math 2013-12-03 18:02:44 +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
Konstantin Matskevich eaf620ddde small fix 2013-12-03 14:57:13 +04:00
Konstantin Matskevich 14dccdf23d T-API cv::log, cv::exp, cv::magnitude, cv::phase 2013-12-03 14:07:00 +04:00
Roman Donchenko 35ea600c54 Merge pull request #1891 from alalek:cv_error_noreturn 2013-12-03 13:57:35 +04:00
Alexander Alekhin cb4267cb38 ts/perf: int -> enum WarmUpType 2013-12-03 12:40:31 +04:00
Roman Donchenko 17f53bc301 Merge pull request #1904 from severin-lemaignan:emscripten 2013-12-03 12:14:09 +04:00
Roman Donchenko 6e9a7706ce Merge pull request #1890 from alalek:ts_fix_seh_exceptions_handling 2013-12-03 11:56:49 +04:00
Andrey Pavlenko 3ff1620086 Merge pull request #1899 from berak:b_3171_24 2013-12-03 11:32:31 +04:00
Andrey Pavlenko 8db6d9f9b2 Merge pull request #1906 from asmorkalov:android_ocl_warn_fix 2013-12-03 11:20:48 +04:00
Andrey Pavlenko 0a624ee67d Merge pull request #1901 from vpisarev:ocl_svm3 2013-12-03 11:20:26 +04:00