andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't cast double to int: use default conversions or explicitly round.

Browse Source 
GCC warns about casting a double return value to int.

Signed-off-by: Jamey Sharp <jamey@minilop.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit 239435875d)
This commit is contained in:
Jamey Sharp 2009-10-28 17:48:18 -07:00 committed by Peter Hutterer
parent ebbac19550
commit 6ca6283bce
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/i2c/fi1236.c
View File

@ -225,7 +225,7 @@ m->f_ifbw=f_ifbw;
m->f_step=f_step;
m->f_lo1=f_rf+f_if1;
m->LO1I=(int)floor((m->f_lo1/f_ref)+0.5);
m->LO1I=lrint(m->f_lo1/f_ref);
m->f_lo1=f_ref*m->LO1I;
m->f_lo2=m->f_lo1-f_rf-f_if2;
@ -258,10 +258,10 @@ if(m->f_lo1<1890.0)m->SEL=1;
m->SEL=0;
/* calculate the rest of the registers */
m->LO2I=(int)floor(m->f_lo2/f_ref);
m->STEP=(int)floor(3780.0*f_step/f_ref);
m->NUM=(int)floor(3780.0*(m->f_lo2/f_ref-m->LO2I));
m->NUM=m->STEP*(int)floor((1.0*m->NUM)/(1.0*m->STEP)+0.5);
m->LO2I=floor(m->f_lo2/f_ref);
m->STEP=floor(3780.0*f_step/f_ref);
m->NUM=floor(3780.0*(m->f_lo2/f_ref-m->LO2I));
m->NUM=m->STEP*lrint((1.0*m->NUM)/(1.0*m->STEP));
}
static int MT2032_wait_for_lock(FI1236Ptr f)

2
hw/xfree86/parser/Flags.c
View File

@ -434,7 +434,7 @@ xf86uLongToString(unsigned long i)
char *s;
int l;
l = (int)(ceil(log10((double)i) + 2.5));
l = ceil(log10((double)i) + 2.5);
s = malloc(l);
if (!s)
return NULL;