generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor a section of icvRotatingCalipers to work around a GCC bug

Browse Source 
https://bugs.launchpad.net/ubuntu/+source/gcc-4.9/+bug/1474304
This commit is contained in:
Roman Donchenko 2015-07-14 13:23:37 +03:00 committed by Dikay900
parent 190d00ea3e
commit e1be6d0888
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/imgproc/src/rotcalipers.cpp
View File

@ -184,24 +184,28 @@ static void rotatingCalipers( const Point2f* points, int n, int mode, float* out
/* compute cosine of angle between calipers side and polygon edge */ /* compute cosine of angle between calipers side and polygon edge */
/* dp - dot product */ /* dp - dot product */
float dp0 = base_a * vect[seq[0]].x + base_b * vect[seq[0]].y; float dp[4] = {
float dp1 = -base_b * vect[seq[1]].x + base_a * vect[seq[1]].y; +base_a * vect[seq[0]].x + base_b * vect[seq[0]].y,
float dp2 = -base_a * vect[seq[2]].x - base_b * vect[seq[2]].y; -base_b * vect[seq[1]].x + base_a * vect[seq[1]].y,
float dp3 = base_b * vect[seq[3]].x - base_a * vect[seq[3]].y; -base_a * vect[seq[2]].x - base_b * vect[seq[2]].y,
+base_b * vect[seq[3]].x - base_a * vect[seq[3]].y,
};
float cosalpha = dp0 * inv_vect_length[seq[0]]; float maxcos = dp[0] * inv_vect_length[seq[0]];
float maxcos = cosalpha;
/* number of calipers edges, that has minimal angle with edge */ /* number of calipers edges, that has minimal angle with edge */
int main_element = 0; int main_element = 0;
/* choose minimal angle */ /* choose minimal angle */
cosalpha = dp1 * inv_vect_length[seq[1]]; for ( i = 1; i < 4; ++i )
maxcos = (cosalpha > maxcos) ? (main_element = 1, cosalpha) : maxcos; {
cosalpha = dp2 * inv_vect_length[seq[2]]; float cosalpha = dp[i] * inv_vect_length[seq[i]];
maxcos = (cosalpha > maxcos) ? (main_element = 2, cosalpha) : maxcos; if (cosalpha > maxcos)
cosalpha = dp3 * inv_vect_length[seq[3]]; {
maxcos = (cosalpha > maxcos) ? (main_element = 3, cosalpha) : maxcos; main_element = i;
maxcos = cosalpha;
}
}
/*rotate calipers*/ /*rotate calipers*/
{ {