projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3edf7c5
ffdbddd
)
Merge branch 2.4
author
Andrey Kamaev
<andrey.kamaev@itseez.com>
Fri, 21 Dec 2012 13:58:48 +0000
(17:58 +0400)
committer
Andrey Kamaev
<andrey.kamaev@itseez.com>
Fri, 21 Dec 2012 13:58:48 +0000
(17:58 +0400)
1
2
CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
patch
|
diff1
|
diff2
|
blob
|
history
doc/user_guide/ug_mat.rst
patch
|
diff1
|
diff2
|
blob
|
history
modules/core/include/opencv2/core/operations.hpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/core/src/persistence.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
patch
|
diff1
|
diff2
|
blob
|
history
modules/objdetect/perf/perf_cascadeclassifier.cpp
patch
|
diff1
|
diff2
|
blob
|
history
modules/ts/src/ts_perf.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
CMakeLists.txt
Simple merge
diff --cc
doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
Simple merge
diff --cc
doc/user_guide/ug_mat.rst
index
ad930ba
,
f6474fa
..
e475c28
---
1
/
doc/user_guide/ug_mat.rst
---
2
/
doc/user_guide/ug_mat.rst
+++ b/
doc/user_guide/ug_mat.rst
@@@
-71,7
-71,9
+71,9
@@@
There are functions in OpenCV, especial
//... fill the array
Mat pointsMat = Mat(points);
- One can access a point in this matrix using the same method \texttt{Mat::at}: ::
-One can access a point in this matrix using the same method ``Mat::at`` :
++One can access a point in this matrix using the same method ``Mat::at`` :
+
+ ::
Point2f point = pointsMat.at<Point2f>(i, 0);
diff --cc
modules/core/include/opencv2/core/operations.hpp
Simple merge
diff --cc
modules/core/src/persistence.cpp
Simple merge
diff --cc
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
Simple merge
diff --cc
modules/objdetect/perf/perf_cascadeclassifier.cpp
Simple merge
diff --cc
modules/ts/src/ts_perf.cpp
Simple merge