From d95127c279523d5f4d094943667b9b8f4ccc7dd6 Mon Sep 17 00:00:00 2001
From: Alexander Shishkov <no@email>
Date: Sun, 11 Mar 2012 16:01:20 +0000
Subject: [PATCH] #1672 updated some more links

---
 doc/opencv_cheatsheet.pdf   | Bin 215668 -> 215641 bytes
 doc/opencv_cheatsheet.tex   |   6 ++++--
 modules/python/test/test.py |   2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/doc/opencv_cheatsheet.pdf b/doc/opencv_cheatsheet.pdf
index c15df739b1a0c212094c9f96520c71b20c29e5d5..4b4e6744b95b82f0da564d85858df4441a81ac7c 100644
GIT binary patch
delta 3820
zcmai1J&T=H5XQU;var?0wUaB7pxvDLIOohFyD>Leu(A+YECemI6il|TdkYI&VFT|E
z5Uhn1sl~!7m4%2^uoOX1d!ILZKW7RrEcY_!V`iRt&NH+BJUaaK(c$;som|nq{`k+6
z#fw+p+^tu1=jE?1&c41ld*R8&*^Mv$eaTG<PfvAtZT0gn9iAQ+ThRPje7-oCznPr6
zO+VXka$G&HQJLPTSYwH6-HS~R>)@}}o)<f}>Bsq?ayr<Er=vEU+@!o#r`PLnG+nmg
ztz*v1re%8E27kp`PxtEd!+iE;$63*|EVWJV_c>mtw8$>gw|$Pc<~6eE?|F?%S}UbZ
zOUGKx!4ms)HLqpxnwviP-G^s4MigNGRw{GllFcOBng!%>)>|kemC6+0fKBDO-*L+Y
z7^}AExb_-2L#0s<@WaMEzyq7%_L*iIzQNXb*9QLtqetASbc7QRckz@-uO$W3yQD;%
zEZyfkwv?S~cH;X{KM&eHp~XlgqQE2`9W&L{OSCOCOkH9yTyoTmcm3>iI2tXLl~IO#
zg~vxo%%!F{SyBa=YpNh~zpmi)%h_-^l19F<aE(=B(H{BBQa$pQ#Y+lI3&(1*;=-97
zyZmJ}OTlPsyL_7~$Lc+yWF=Ke*gWnNWWSrphx3IZWRZg+oL;twao*P~I$`UTr$6ot
zw?|5uo7R9D*hDdSre+*yhkeEYAlM}9cdM&r0PHrMqH*LA4zmVy;TRWAKfQzCZ5OE-
zc&fdGgkY;J&;@stEVk8Sb+NA}sTA>k?PJ^oPokiFP!my2iXhq&;YB^YOR*B$B?-FI
zUc$4siDgX{>q(>qB@Cq@sS?qG4c#FoQkw+?vCrEWctX;Or^8K4C?WRM%+uDB=tD3f
zp9sZYBQvhK17pojAkry7h;(`&&Mj~TimH+Du(i-=fxoy%5|Tos_v(Z)DRPdlP{Hn4
z5=G}rwo(#5v`F_c)Jf5GBh*^@imh9+DwjCFkV2g!S_+*__i^8d>bQEkq*CJG2b)NQ
zTEW)H50#cPR!aO(h5YU(`~fMHHZgOSoc)c2Hj~Jus%i32!@PC-e0Xz=x6aa^us}8;
zBvSJndbNxr$dvADYh|G=wY6KKtU6P2jDb9|&Y*~q+J-40I<A8B_8<ebD_(ODc*tQA
zc-VUC>yFyT;=4cz_MA|`aEbv1?_)c`!G_lts9lPt;Q_W9^|dhDb>H5(khw*YKvn>2
za4bY^o$#94MOus912&IZS`=6Z&cMbRZPiLtrBcnJUXP_=%2`LVdS|d%>@pBsPOv(J
zAk-a%Sxw|yWajqP1N``htpL@zwd`(0L4zz|qeUXYRz1`mHh9^G8n&K?2T1AW-A=!~
zJNU<R4;%4ky1ZL$xwOu5UiE%oVy0<rdAfM}f46+JI6Xahc=^eL%P${%`q=>nUT%JH
L>(>4E&JX?rm-6pc

delta 3879
zcmb7HO>3Q15XM{=63jv>5p>~2sJ-Gx=IeY#$w!+6T}Zcrh=w#Rg*LauXzS`OT<BIT
zy#4}l;X-iH{scFI8$rQMcm4ncmp<>k`MNU&F`FBnIp@rCW}cZj@9+1Q{<^>P!?&xW
zyEkv$8sELKd$@aJ|Bb!z?Uifey-#lM9~|u--5ejR?A^JuvNt~5|M2UtF2Atw>FYoK
zvHH@J|7X+lpWFHuw*JHeTVMF>?@^^J`YPEaqD!wVuDm<GwzYe-KOAkX3bBwf^K?n~
zs||i$HW^a?H#`_F_P;`nS-OX5u)5rGu#wd6sSH~pZ>!CudoK^#bA_X^ChNZIH|7>L
z7HQo-y-lJmr_{Y&V6$jTxpv<aILws7p;o#3v)`CG*tA(!>y&AUMxpM@ij75sO;ozy
zdYjZ>W3z75V5^ZSrQF@?Z82=6RetbO8$4Q=u)hXzQgIA{C5u?ejuF<iX7enGAq^J}
zV3wxmEuE<VVE5?F!G%e#%?X6KFuQOAQwsh|irh<y+)MM3Ca&E2=ugfm6QD^TU%}pA
zvI6v2qw3O0a6#d6EuHt#`zI`X4C@BaIYE6j9|a*3?^r1NvP0d~?8yjEB5Psw<wXLW
z_{az&{+=K=Uw$OQHINpYr4#o*X$)AHLq0`n$fqb3*Ek4u(*i+F<SGU0ik$Bq)A)-v
z4GfJ_2)}9ZS`bS$kTEFEM<$^+228Go+$o~q7b>FQZ=xs&Pe!$S=E~s0YnoCtmFka`
zRBP*g*%-V$(Qwyf?R=o1QmBeOU7?balONWl<YLk*(yI!4^YH{Irz!v_UP9O`*##8q
zaA5cSCdd~T8?3M9E(ENQQwYxB*k^O|3B|gq&IhRx&wRXpN*<t?SCX2A&Y)I;)YV!j
zQ0+E02G35CMfWL(_MoYei#sWD7BO&gT2$mLFwdp-A)9NGS|A0#xuC`ahH42IyacR;
zZm*Tk3ux9P6*&kusX019cMb&6or7a^=MV*SXQyV;HY$Fq0&HG&WYqBvMjHO{m1Zaj
z&)x743K(O6x&Rs5W7cI~5M<n@f}G112AY4KU|xh$1ooH%rOoxqeo~oom@K9c&l%}i
zwoK7n&cJ>zHrIF)qaX=0DIp5zpRRmK@s{+Nmb@Ha4`$Z77k37uNeFn7<d3zK*((=V
zymxAmI`SO$7MZ<&P)Vo5&gx0~IO`r(Q&6cjj5Z%f`1S25VYGQQCy0KY404mz!XQ8q
znU{U3p^2jnqK+JyrkIog3$H~+s!Ey6F9aA~T#RR~cLFT?9?F8KI>*4OR|!k2rx%_a
ze}u3Sle;l%K~5Y&t>oJ$TOzL+U{d_voY*&_2}2*gN8@cP)5j=E<U}99lAk1~Z}E?C
zU||jjrQ-+p*?AaYi2ra_n<q~CPca`>V47W(0836t{bw9xJs&M#XxtGydmuc0`VH7B
zbr0VeY<{$}leJ#a%UZY4e7B`4C*IE6n_J+Vcx!F=)_*SfV7Run`0>&1;nBUr{p*W@
O+)`e=cyasc&f>oqkqIjR

diff --git a/doc/opencv_cheatsheet.tex b/doc/opencv_cheatsheet.tex
index 97ffceb83c..5bca2864ff 100644
--- a/doc/opencv_cheatsheet.tex
+++ b/doc/opencv_cheatsheet.tex
@@ -278,11 +278,13 @@ other matrix operations, such as
 
 \begin{itemize}
 \item
-\texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#add}{add()}},  \texttt{\href{http://opencv.willowgarage.com/documentation/cpp/core_operations_on_arrays.html\#cv-subtract}{subtract()}},
+\texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#add}{add()}},  
+\texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#subtract}{subtract()}},
 \texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#multiply}{multiply()}},
 \texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#divide}{divide()}},
 \texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#absdiff}{absdiff()}},
-\texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#bitwise-and}{bitwise\_and()}},  \texttt{\href{http://opencv.willowgarage.com/documentation/cpp/core_operations_on_arrays.html\#bitwise-or}{bitwise\_or()}},
+\texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#bitwise-and}{bitwise\_and()}},
+\texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#bitwise-or}{bitwise\_or()}},
 \texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#bitwise-xor}{bitwise\_xor()}},
 \texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#max}{max()}},
 \texttt{\href{http://opencv.itseez.com/modules/core/doc/operations_on_arrays.html\#min}{min()}},
diff --git a/modules/python/test/test.py b/modules/python/test/test.py
index 2ed785c1cb..e8223a5c88 100644
--- a/modules/python/test/test.py
+++ b/modules/python/test/test.py
@@ -1583,7 +1583,7 @@ class AreaTests(OpenCVTests):
             cv.SetData(imagefiledata, filedata, len(filedata))
             return cv.DecodeImageM(imagefiledata)
 
-        urllib.urlretrieve("http://pr.willowgarage.com/data/camera_calibration/camera_calibration.tar.gz", "camera_calibration.tar.gz")
+        urllib.urlretrieve("http://opencv.itseez.com/data/camera_calibration.tar.gz", "camera_calibration.tar.gz")
         tf = tarfile.open("camera_calibration.tar.gz")
 
         num_x_ints = 8