[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    PATCH: ambigous calls of atan2, log
From:       Hans-Joachim Baader <hjb () pro-linux ! de>
Date:       2002-01-30 18:04:07
[Download RAW message or body]

Hi,

something like the following is necessary to compile the 3.0 cvs with
gcc 3.1 on Linux/ix86. Please apply as soon as possible.

diff -ur kdemultimedia/arts/gui/kde/kpoti.cpp \
                /app/kde/kdemultimedia/arts/gui/kde/kpoti.cpp
--- kdemultimedia/arts/gui/kde/kpoti.cpp	Sat Jan 12 10:40:41 2002
+++ /app/kde/kdemultimedia/arts/gui/kde/kpoti.cpp	Wed Jan 30 17:49:15 2002
@@ -378,7 +378,7 @@
   resetState();
 
   if ( e->button() == MidButton ) {
-    float pos = atan2( e->pos().x()-center.x(),- e->pos().y() + center.y() );
+    float pos = atan2( (float) e->pos().x()-center.x(),- e->pos().y() + center.y() \
);  movePoti( pos );
     return;
   }
@@ -416,7 +416,7 @@
 {
 
     if ( (e->state() & MidButton) ) { 		// middle button wins
-      float pos = atan2( e->pos().x()-center.x(),- e->pos().y()+center.y() );
+      float pos = atan2( (float) e->pos().x()-center.x(),- e->pos().y()+center.y() \
);  movePoti( pos );
       return;	
     }
diff -ur kdemultimedia/arts/modules/synth_cdelay_impl.cc \
                /app/kde/kdemultimedia/arts/modules/synth_cdelay_impl.cc
--- kdemultimedia/arts/modules/synth_cdelay_impl.cc	Fri Aug 31 20:34:04 2001
+++ /app/kde/kdemultimedia/arts/modules/synth_cdelay_impl.cc	Wed Jan 30 17:51:44 2002
@@ -63,7 +63,7 @@
 	void time(float newTime)
 	{
 		_delaytime = newTime;
-		double n = ceil( log( _delaytime * samplingRateFloat ) / log( 2 ) );
+		double n = ceil( log( (double) _delaytime * samplingRateFloat ) / log( 2 ) );
 		unsigned long newbuffersize = (unsigned long)( pow( 2, n ) );
 		unsigned long newbitmask = newbuffersize - 1;
 		if( newbuffersize != _buffersize )
diff -ur kdemultimedia/arts/modules/synth_delay_impl.cc \
                /app/kde/kdemultimedia/arts/modules/synth_delay_impl.cc
--- kdemultimedia/arts/modules/synth_delay_impl.cc	Fri Aug 31 20:34:04 2001
+++ /app/kde/kdemultimedia/arts/modules/synth_delay_impl.cc	Wed Jan 30 17:50:54 2002
@@ -101,7 +101,7 @@
 		if( newmaxdelay <= 0 )
 			return;
 		_maxdelay = newmaxdelay;
-		double n = ceil( log( _maxdelay * samplingRateFloat ) / log( 2 ) );
+		double n = ceil( log( (double) _maxdelay * samplingRateFloat ) / log( 2 ) );
 		unsigned long newbuffersize = (unsigned long)( pow( 2, n ) );
 		unsigned long newbitmask = newbuffersize - 1;
 		if( newbuffersize != _buffersize )


Regards,
hjb
-- 
Pro-Linux - Germany's largest volunteer Linux support site
http://www.pro-linux.de/          Public Key ID 0x3DDBDDEA


[Attachment #3 (application/pgp-signature)]
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

[prev in list] [next in list] [prev in thread] [next in thread]