Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

No changes, just remove an extra pair of braces in wxHTML code.

Browse Source 
See #15348.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74568 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-17 17:27:04 +00:00
parent 4e2a1db748
commit 4cdb8e430c
1 changed files with 78 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
src/html/m_image.cpp
View File

@@ -124,88 +124,86 @@ wxHtmlLinkInfo *wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
} }
break; break;
case POLY: case POLY:
{ if (coords.GetCount() >= 6)
if (coords.GetCount() >= 6) {
{ int intersects = 0;
int intersects = 0; int wherex = x;
int wherex = x; int wherey = y;
int wherey = y; int totalv = coords.GetCount() / 2;
int totalv = coords.GetCount() / 2; int totalc = totalv * 2;
int totalc = totalv * 2; int xval = coords[totalc - 2];
int xval = coords[totalc - 2]; int yval = coords[totalc - 1];
int yval = coords[totalc - 1]; int end = totalc;
int end = totalc; int pointer = 1;
int pointer = 1;
if ((yval >= wherey) != (coords[pointer] >= wherey)) if ((yval >= wherey) != (coords[pointer] >= wherey))
{ {
if ((xval >= wherex) == (coords[0] >= wherex)) if ((xval >= wherex) == (coords[0] >= wherex))
{ {
intersects += (xval >= wherex) ? 1 : 0; intersects += (xval >= wherex) ? 1 : 0;
} }
else else
{ {
intersects += ((xval - (yval - wherey) * intersects += ((xval - (yval - wherey) *
(coords[0] - xval) / (coords[0] - xval) /
(coords[pointer] - yval)) >= wherex) ? 1 : 0; (coords[pointer] - yval)) >= wherex) ? 1 : 0;
} }
} }
while (pointer < end) while (pointer < end)
{ {
yval = coords[pointer]; yval = coords[pointer];
pointer += 2; pointer += 2;
if (yval >= wherey) if (yval >= wherey)
{ {
while ((pointer < end) && (coords[pointer] >= wherey)) while ((pointer < end) && (coords[pointer] >= wherey))
{ {
pointer += 2; pointer += 2;
} }
if (pointer >= end) if (pointer >= end)
{ {
break; break;
} }
if ((coords[pointer - 3] >= wherex) == if ((coords[pointer - 3] >= wherex) ==
(coords[pointer - 1] >= wherex)) { (coords[pointer - 1] >= wherex)) {
intersects += (coords[pointer - 3] >= wherex) ? 1 : 0; intersects += (coords[pointer - 3] >= wherex) ? 1 : 0;
} }
else else
{ {
intersects += intersects +=
((coords[pointer - 3] - (coords[pointer - 2] - wherey) * ((coords[pointer - 3] - (coords[pointer - 2] - wherey) *
(coords[pointer - 1] - coords[pointer - 3]) / (coords[pointer - 1] - coords[pointer - 3]) /
(coords[pointer] - coords[pointer - 2])) >= wherex) ? 1 : 0; (coords[pointer] - coords[pointer - 2])) >= wherex) ? 1 : 0;
} }
} }
else else
{ {
while ((pointer < end) && (coords[pointer] < wherey)) while ((pointer < end) && (coords[pointer] < wherey))
{ {
pointer += 2; pointer += 2;
} }
if (pointer >= end) if (pointer >= end)
{ {
break; break;
} }
if ((coords[pointer - 3] >= wherex) == if ((coords[pointer - 3] >= wherex) ==
(coords[pointer - 1] >= wherex)) (coords[pointer - 1] >= wherex))
{ {
intersects += (coords[pointer - 3] >= wherex) ? 1 : 0; intersects += (coords[pointer - 3] >= wherex) ? 1 : 0;
} }
else else
{ {
intersects += intersects +=
((coords[pointer - 3] - (coords[pointer - 2] - wherey) * ((coords[pointer - 3] - (coords[pointer - 2] - wherey) *
(coords[pointer - 1] - coords[pointer - 3]) / (coords[pointer - 1] - coords[pointer - 3]) /
(coords[pointer] - coords[pointer - 2])) >= wherex) ? 1 : 0; (coords[pointer] - coords[pointer - 2])) >= wherex) ? 1 : 0;
} }
} }
} }
if ((intersects & 1) != 0) if ((intersects & 1) != 0)
{ {
return m_Link; return m_Link;
} }
}
} }
break; break;
} }