potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #9075 from TonyLianLong:master

Browse Source 
Remove unnecessary Non-ASCII characters from source code (#9075)

* Remove unnecessary Non-ASCII characters from source code

Remove unnecessary Non-ASCII characters and replace them with ASCII
characters

* Remove dashes in the @param statement

Remove dashes and place single space in the @param statement to keep
coding style

* misc: more fixes for non-ASCII symbols

* misc: fix non-ASCII symbol in CMake file
This commit is contained in:
Tony Lian
2017-07-03 09:14:17 -07:00
committed by Alexander Alekhin
parent 9aaf6a66a3
commit c8783f3e23
25 changed files with 75 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/window_carbon.cpp
+3 -3
View File
@@ -282,7 +282,7 @@ static void icvPutImage( CvWindow* window )
static void icvUpdateWindowSize( const CvWindow* window )
{
int width = 0, height = 240; /* init à al taille de base de l'image*/
int width = 0, height = 240;
Rect globalBounds;
GetWindowBounds(window->window, kWindowContentRgn, &globalBounds);
@@ -1031,7 +1031,7 @@ static pascal OSStatus windowEventHandler(EventHandlerCallRef nextHandler, Event
GetWindowBounds(theWindow, kWindowStructureRgn, &structure);
GetWindowBounds(theWindow, kWindowContentRgn, &content);
lx = (int)point.x - content.left + structure.left;
ly = (int)point.y - window->trackbarheight - content.top + structure.top; /* minus la taille des trackbars */
ly = (int)point.y - window->trackbarheight - content.top + structure.top;
if (window->flags & CV_WINDOW_AUTOSIZE) {//FD
//printf("was %d,%d\n", lx, ly);
/* scale the mouse coordinates */
@@ -1039,7 +1039,7 @@ static pascal OSStatus windowEventHandler(EventHandlerCallRef nextHandler, Event
ly = ly * window->imageHeight / (content.bottom - content.top - window->trackbarheight);
}
if (lx>0 && ly >0){ /* a remettre dans les coordonnées locale */
if (lx>0 && ly >0){
window->on_mouse (event, lx, ly, flags, window->on_mouse_param);
return noErr;
}