Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed Android build warnings in logpolar_bsm

Browse Source
pull/13383/head
Andrey Kamaev 13 years ago
parent c94c3fb4eb
commit bddff7b386
1 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      modules/contrib/src/logpolar_bsm.cpp

18
modules/contrib/src/logpolar_bsm.cpp
Unescape View File

@ -76,11 +76,11 @@ LogPolar_Interp::LogPolar_Interp(int w, int h, Point2i center, int R, double ro0
if (center.x<=w/2 && center.y>=h/2) if (center.x<=w/2 && center.y>=h/2)
rtmp=(int)sqrt((float)center.y*center.y + (float)(w-center.x)*(w-center.x)); rtmp=(int)sqrt((float)center.y*center.y + (float)(w-center.x)*(w-center.x));
if (center.x>=w/2 && center.y>=h/2) else if (center.x>=w/2 && center.y>=h/2)
rtmp=(int)sqrt((float)center.y*center.y + (float)center.x*center.x); rtmp=(int)sqrt((float)center.y*center.y + (float)center.x*center.x);
if (center.x>=w/2 && center.y<=h/2) else if (center.x>=w/2 && center.y<=h/2)
rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)center.x*center.x); rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)center.x*center.x);
if (center.x<=w/2 && center.y<=h/2) else //if (center.x<=w/2 && center.y<=h/2)
rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)(w-center.x)*(w-center.x)); rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)(w-center.x)*(w-center.x));
M=2*rtmp; N=2*rtmp; M=2*rtmp; N=2*rtmp;
@ -222,11 +222,11 @@ LogPolar_Overlapping::LogPolar_Overlapping(int w, int h, Point2i center, int R,
if (center.x<=w/2 && center.y>=h/2) if (center.x<=w/2 && center.y>=h/2)
rtmp=(int)sqrt((float)center.y*center.y + (float)(w-center.x)*(w-center.x)); rtmp=(int)sqrt((float)center.y*center.y + (float)(w-center.x)*(w-center.x));
if (center.x>=w/2 && center.y>=h/2) else if (center.x>=w/2 && center.y>=h/2)
rtmp=(int)sqrt((float)center.y*center.y + (float)center.x*center.x); rtmp=(int)sqrt((float)center.y*center.y + (float)center.x*center.x);
if (center.x>=w/2 && center.y<=h/2) else if (center.x>=w/2 && center.y<=h/2)
rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)center.x*center.x); rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)center.x*center.x);
if (center.x<=w/2 && center.y<=h/2) else //if (center.x<=w/2 && center.y<=h/2)
rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)(w-center.x)*(w-center.x)); rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)(w-center.x)*(w-center.x));
M=2*rtmp; N=2*rtmp; M=2*rtmp; N=2*rtmp;
@ -447,11 +447,11 @@ LogPolar_Adjacent::LogPolar_Adjacent(int w, int h, Point2i center, int R, double
if (center.x<=w/2 && center.y>=h/2) if (center.x<=w/2 && center.y>=h/2)
rtmp=(int)sqrt((float)center.y*center.y + (float)(w-center.x)*(w-center.x)); rtmp=(int)sqrt((float)center.y*center.y + (float)(w-center.x)*(w-center.x));
if (center.x>=w/2 && center.y>=h/2) else if (center.x>=w/2 && center.y>=h/2)
rtmp=(int)sqrt((float)center.y*center.y + (float)center.x*center.x); rtmp=(int)sqrt((float)center.y*center.y + (float)center.x*center.x);
if (center.x>=w/2 && center.y<=h/2) else if (center.x>=w/2 && center.y<=h/2)
rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)center.x*center.x); rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)center.x*center.x);
if (center.x<=w/2 && center.y<=h/2) else //if (center.x<=w/2 && center.y<=h/2)
rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)(w-center.x)*(w-center.x)); rtmp=(int)sqrt((float)(h-center.y)*(h-center.y) + (float)(w-center.x)*(w-center.x));
M=2*rtmp; N=2*rtmp; M=2*rtmp; N=2*rtmp;

Write Preview
Loading…
Cancel
Save