dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

fix wrong argument in checking boundaries for a rectangle 

some whitespace fixes


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@126448 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
rizzo 2008-06-29 18:50:20 +00:00
parent 4de1453761
commit 51e7a64b4d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
channels/console_board.c
View File

@ -148,7 +148,7 @@ struct board *board_setup(SDL_Surface *screen, SDL_Rect *dest,
b->cur_col = 0; /* current print column */
b->cur_line = 0; /* last line displayed */
ast_log(LOG_WARNING, "Message board %dx%d@%d,%d successfully initialized\n",
if (0) ast_log(LOG_WARNING, "Message board %dx%d@%d,%d successfully initialized\n",
b->p_rect->w, b->p_rect->h,
b->p_rect->x, b->p_rect->y);
return b;

5
channels/console_gui.c
View File

@ -75,7 +75,7 @@ struct keypad_entry {
/* our representation of a displayed window. SDL can only do one main
* window so we map everything within that one
*/
struct display_window {
struct display_window {
SDL_Overlay *bmp;
SDL_Rect rect; /* location of the window */
};
@ -444,6 +444,7 @@ static void handle_mousedown(struct video_desc *env, SDL_MouseButtonEvent button
case KEY_DIGIT_BACKGROUND:
break;
default:
ast_log(LOG_WARNING, "function not yet defined %i\n", index);
}
@ -1027,7 +1028,7 @@ static int kp_match_area(const struct keypad_entry *e, int x, int y)
xp = ((x - e->x0)*dx + (y - e->y0)*dy)/l;
yp = (-(x - e->x0)*dy + (y - e->y0)*dx)/l;
if (e->type == KP_RECT) {
ret = (xp >= 0 && xp < l && yp >=0 && yp < l);
ret = (xp >= 0 && xp < l && yp >=0 && yp < e->h);
} else if (e->type == KP_CIRCLE) {
dx = xp*xp/(l*l) + yp*yp/(e->h*e->h);
ret = (dx < 1);

1
channels/console_video.h
View File

@ -138,6 +138,5 @@ int reset_board(struct board *b);
/*! \brief deallocates memory space for a board */
void delete_board(struct board *b);
#endif /* CONSOLE_VIDEO_H */
/* end of file */