opencv/c at 3ccaa5294e49843cca3586f7bf14aef9b1b91a48 - opencv - Atria-soft GIT

generic-library/opencv

History

Roman Donchenko 2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/cudaimgproc/test/test_color.cpp
	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_imgproc.cpp
	modules/java/generator/src/cpp/VideoCapture.cpp
	samples/gpu/performance/CMakeLists.txt
	samples/tapi/CMakeLists.txt

2014-02-03 13:23:59 +04:00

..

War on Whitespace, master edition: file endings.

2013-08-27 14:23:26 +04:00

adaptiveskindetector.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-01-14 11:53:59 +04:00

agaricus-lepiota.data

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

airplane.jpg

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

baboon200_rotated.jpg

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

baboon200.jpg

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

baboon.jpg

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

bgfg_codebook.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

blobtrack_sample.cpp

Merge remote-tracking branch 'upstream/2.4' into merge-2.4

2013-10-15 20:08:52 +04:00

box_in_scene.png

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

box.png

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

build_all.sh

Restored one executable bit that was lost during the war on whitespace.

2013-08-27 14:39:43 +04:00

calonder_params.xml

Added sample for GenericDescriptorMatch

2010-06-10 07:59:18 +00:00

cat.jpg

Added error handling in latentsvmdetect sample

2010-10-16 07:10:46 +00:00

cat.xml

Integration object detection using Latent SVM. Sample was added.

2010-10-09 11:36:06 +00:00

CMakeLists.txt

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-02-03 13:23:59 +04:00

contours.c

Fixed build with MSVC

2012-06-20 16:03:03 +00:00

convert_cascade.c

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

cvsample.dsp

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

cvsample.vs2005.vcproj

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

delaunay.c

Make imgproc.hpp independent from C API

2013-04-08 15:47:28 +04:00

facedetect.cmd

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

facedetect.cpp

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

fback_c.c

Move C API of opencv_video to separate file

2013-04-11 17:38:33 +04:00

find_obj_calonder.cpp

DescriptorExtractor: added defaultNorm() to return default norm type.

2013-12-09 09:54:42 -02:00

find_obj_ferns.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

find_obj.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

fruits.jpg

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

intrinsics.yml

converted some OpenCV C samples to C++

2010-11-27 23:15:16 +00:00

JCB.png

datamatrix

2011-04-25 21:51:36 +00:00

latentsvmdetect.cpp

Compile OpenCV with GCC visibility set to hidden

2013-05-13 18:33:20 +04:00

lena.jpg

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

morphology.c

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

motempl.c

Move C API of opencv_video to separate file

2013-04-11 17:38:33 +04:00

mser_sample.cpp

Move non-CV functionality from core.hpp to separate utility.hpp header

2013-03-20 17:56:06 +04:00

mushroom.cpp

Fixed mismatching allocation and deallocation: el_ptr

2013-08-14 23:36:29 +10:00

one_way_sample.cpp

Make highgui.hpp independent from C API

2013-04-08 15:47:29 +04:00

one_way_train_0000.jpg

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

one_way_train_0001.jpg

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

one_way_train_images.txt

Storing PCA components and One Way descriptors in one yml file.

2010-06-02 05:19:09 +00:00

polar_transforms.c

Make imgproc.hpp independent from C API

2013-04-08 15:47:28 +04:00

puzzle.png

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

pyramid_segmentation.c

Make imgproc.hpp independent from C API

2013-04-08 15:47:28 +04:00

scene_l.bmp

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

scene_r.bmp

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

smiledetect.cpp

Move C API of opencv_objdetect to separate file

2013-04-12 14:37:01 +04:00

stuff.jpg

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

tree_engine.cpp

Move cv::Mat out of core.hpp

2013-04-01 15:24:34 +04:00

tree.avi

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00

waveform.data

"atomic bomb" commit. Reorganized OpenCV directory structure

2010-05-11 17:44:00 +00:00