From e03c81d90a7413a40001c8a4f2a1f2d39527a040 Mon Sep 17 00:00:00 2001 From: "PkLab.net" Date: Tue, 21 Feb 2017 20:02:30 +0100 Subject: [PATCH] Change image e small fix to cv::ellipse() Doc --- modules/imgproc/doc/pics/ellipse.png | Bin 2425 -> 0 bytes modules/imgproc/doc/pics/ellipse.svg | 1156 +++++++++++++++++++ modules/imgproc/include/opencv2/imgproc.hpp | 11 +- 3 files changed, 1162 insertions(+), 5 deletions(-) delete mode 100644 modules/imgproc/doc/pics/ellipse.png create mode 100644 modules/imgproc/doc/pics/ellipse.svg diff --git a/modules/imgproc/doc/pics/ellipse.png b/modules/imgproc/doc/pics/ellipse.png deleted file mode 100644 index 2b16c9396a50393b389c496cff9e93cd0284f5fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2425 zcmZuzXE+-Q8`V-OF^XP$RH#*}icl4bQX@Vi^;N8DNn=E#_MWvRtu1y!-54cAYp>e9 zNE)JoYU#BuZLQjT`u)D=oOe9u$9dkLZ?cu82`4}pz{JGFX?owthKcDy<9RW&FrPb6 z_Pw6-p=xCTyLWbWcD^z(C7!bc%;ezUfI^{6O-=uA{!6?3bXJmyiJisN=q@anu~EdC zGb6_lZJo!QG$(!ys?v=Ki{9y&J+nw<3G61N7wxk-t~S*b3k7AU@EY)5ym1}$8x5V& zrR=!hQZitEQre-)S^{?6cOcR4a9&}1+!wnmB8|7rIa*XcZhEY7Q4np`hoi2XFrU0! zoz=KfZU_{3;KeC8=9NyNT){~KH3A6oPXj0z4SMO`wJ~MuN$;1II%6iFbVZdKqf^a@ zWzlWio3We9hRl9&vL7p4*4WmL!UFxRQ;50}GFApj`=Omehjyu5a(Zne1&6tY)mq%0 zgd1A!IoYjmMG-=?<%5J2Y##_q+w8Jm6;_@v&zARALBO!U!cTu9?jsGelt-Iz!~c`QHoZd??i}=dYFP zhmHmKQSw#_{s<)M`)*TX-+1rrno{6W;h{t3UyY{=l3g=uz)xMOC=RSj&qaK-o)hn) zXh@RY#47iiahr6pbM?rCW=u}T?!qEqLK8!mGN-1=yPycj+|!+kC#s2d?Tq!y41J0# z0XgvKfPi8_$rUz`7*>a_}cAWGVoWSxBZ ze$x!z8f2>bxbsq?GQ>nAb-m5u=EIEvB#d2OIV%2f_aKs>oeE8V!lvG5RdcbCl@YA@ z`Y6cxotT&7xMcr9PsdegwK&5_`E{67sIB_4WXp5D*7S)jNGF5=%OM`+wEgHq=+PKy z$3j>GT1go+TUS_?C_ASu>H)c1ptyoGNac*&yZ@mRnOrrT)=ZIig}$&aPm3( z_H1C0%5UNGHnnbx2i~>0p9hF_3MTkrnkk~^Cw%xWwVVVT-IOD@$PgVW{;uY()A&R% zg9ly^9-nN6dE^p2YeG+*BAYmJ6*g4KA)d5aZ3MOc8rgm`$8Ii^R~g2LK{i_0=m|WN zr6#QL=KkY~^t1Q~S&VQ*VAd$OuHra)|55W_qGGt)RyZM~6D$pw9jFNZEWL5-r0<2< ztwFpybn7U8F%hF`#H1TJ>R3QDLKSW)y(OB+N zCdIADW&bJNU`8!IhlB;j%brACaEn!+2MX9Mk z3h{f22H~g>&3#|)xRH_>$sp{agp^G zAc)CkJc*8f!OZS~)j{ut>%V{N9_n79F~9nehXcRaQZyUa`E&O@6y~wCC|T!Cjg9gr>lc1O}_i5eKX$^>K$q%v`f^ z=s`S(_idl~l_~7!pp~DN8kJXJ2^_n`(8=&QQsp3trZ{3T%i5;hlNpfXfsb0#F7a<} z5zMdYj~1-Q#SNOg-D7rlCy7-NFN-PI2pP``ZE8npBVy%HX|<2cj%%8p~os$F9H#UFOp z2)@4F;auwuYurvdcQOkKs`^tX-6GP3Rr4&fY*}gllF)i0>DF-g)CVc z(7%0J{9Z%1JSqSJQ>m&8_FC{d`;yp`GJxW!wH4u#S31etSqg{VVASf4d<-2)(zQ96C?N_Kr)3F%Me@LIgwDQtfH;2D027$+N*T5I(bESu+SO=>c3ys(SrW`3Nfw$^*U^r)z<`G3AK=o9$Ggi;mAo#OJO`Y^y8?)c;wONzdqo1Hr}%F#}|P@IL>4 zumk^KT{rr@6W@;OC;W6Ha-~nfk8k13a)f?hbZk#-Q+lJlO6r`*SapdNUar$2@G%Tc zyNmvufpQ$sqi36=Nw5*0vW zzDFe1>`~;?U%=+W^vN<)XC)A|vw29Y5Q%ywnzsHbqnRYAmQVEZlU~qw%SslR#f=tD o+$_d?(CaoR#3%hbhGw?(Mm^i?x5&~$zuzR&dzMCT3?9Y)536^Y%m4rY diff --git a/modules/imgproc/doc/pics/ellipse.svg b/modules/imgproc/doc/pics/ellipse.svg new file mode 100644 index 0000000000..9ff78ef890 --- /dev/null +++ b/modules/imgproc/doc/pics/ellipse.svg @@ -0,0 +1,1156 @@ + + + + + OpenCV: Parameters of Elliptic Arc + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + OpenCV: Parameters of Elliptic Arc + + Feb 2017 + + + PkLab.net + + + + + PkLab.net + + + + + + + + + + + + + + + + + + + + FIRST AXIS + X + Y + START ANGLE + END ANGLE + + + + + + + + + + + + + + FIRST AXIS + X + Y + START ANGLE + END ANGLE + + + + + AXES.WIDTH + + + AXES.EIGHT + AXES.WIDTH > AXES.HEIGHT + AXES.WIDTH > AXES.HEIGHT + ANGLE + ANGLE + + + + + + diff --git a/modules/imgproc/include/opencv2/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc.hpp index ace23dd230..a52ef9a656 100644 --- a/modules/imgproc/include/opencv2/imgproc.hpp +++ b/modules/imgproc/include/opencv2/imgproc.hpp @@ -4198,13 +4198,14 @@ CV_EXPORTS_W void circle(InputOutputArray img, Point center, int radius, /** @brief Draws a simple or thick elliptic arc or fills an ellipse sector. The function cv::ellipse with less parameters draws an ellipse outline, a filled ellipse, an elliptic -arc, or a filled ellipse sector. A piecewise-linear curve is used to approximate the elliptic arc +arc, or a filled ellipse sector. The drawing code uses general parametric form. +A piecewise-linear curve is used to approximate the elliptic arc boundary. If you need more control of the ellipse rendering, you can retrieve the curve using -ellipse2Poly and then render it with polylines or fill it with fillPoly . If you use the first -variant of the function and want to draw the whole ellipse, not an arc, pass startAngle=0 and -endAngle=360 . The figure below explains the meaning of the parameters. +cv::ellipse2Poly and then render it with polylines or fill it with cv::fillPoly. If you use the first +variant of the function and want to draw the whole ellipse, not an arc, pass `startAngle=0` and +`endAngle=360`. The figure below explains the meaning of the parameters to draw the blue arc. -![Parameters of Elliptic Arc](pics/ellipse.png) +![Parameters of Elliptic Arc](pics/ellipse.svg) @param img Image. @param center Center of the ellipse.