Received: by mail.netbsd.org (Postfix, from userid 605) id 092F584E2B; Tue, 26 May 2020 11:25:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7E04E84E76 for ; Tue, 26 May 2020 11:25:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id bY4854ppCyR1 for ; Tue, 26 May 2020 11:25:34 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C27C984E2B for ; Tue, 26 May 2020 11:25:34 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id BEEA1FB27; Tue, 26 May 2020 11:25:34 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_159049233458400" MIME-Version: 1.0 Date: Tue, 26 May 2020 11:25:34 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/audio/libvisual0.2-plugins To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200526112534.BEEA1FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_159049233458400 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Tue May 26 11:25:34 UTC 2020 Modified Files: pkgsrc/audio/libvisual0.2-plugins: distinfo Added Files: pkgsrc/audio/libvisual0.2-plugins/patches: patch-plugins_actor_G-Force_Common_UI_LineXX.cpp patch-plugins_actor_G-Force_GForceCommon_G-Force.cpp patch-plugins_actor_G-Force_GForceCommon_WaveShape.cpp Log Message: Disambiguate sqrt and pow calls. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/audio/libvisual0.2-plugins/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_Common_UI_LineXX.cpp \ pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_G-Force.cpp \ pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_WaveShape.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_159049233458400 Content-Disposition: inline Content-Length: 5472 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/libvisual0.2-plugins/distinfo diff -u pkgsrc/audio/libvisual0.2-plugins/distinfo:1.4 pkgsrc/audio/libvisual0.2-plugins/distinfo:1.5 --- pkgsrc/audio/libvisual0.2-plugins/distinfo:1.4 Tue Nov 3 01:12:39 2015 +++ pkgsrc/audio/libvisual0.2-plugins/distinfo Tue May 26 11:25:34 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2015/11/03 01:12:39 agc Exp $ +$NetBSD: distinfo,v 1.5 2020/05/26 11:25:34 joerg Exp $ SHA1 (libvisual-plugins-0.2.0.tar.gz) = bc001f66b1c81b747bc06e3e09aaf71882c47370 RMD160 (libvisual-plugins-0.2.0.tar.gz) = 3f4835843e3719e6342a3b8f1478f89388423b37 @@ -7,4 +7,7 @@ Size (libvisual-plugins-0.2.0.tar.gz) = SHA1 (patch-aa) = 68ffdb6261aafa219df0e5c4d313fc7f865ae734 SHA1 (patch-ab) = 31a380ed59ed9eed1e5516c44fec54c1e7dcf25c SHA1 (patch-ac) = 2bb5757b041cd3161a77fa71f14628c9013c1298 +SHA1 (patch-plugins_actor_G-Force_Common_UI_LineXX.cpp) = 97cd58ba4320cb14e1890a86a829726ff088b128 +SHA1 (patch-plugins_actor_G-Force_GForceCommon_G-Force.cpp) = 514a9f2c0ef7785d4795554436cb2368990b9608 +SHA1 (patch-plugins_actor_G-Force_GForceCommon_WaveShape.cpp) = 5658627e165bc7dbf9469ac0c26f70c69a85f128 SHA1 (patch-plugins_morph_flash_morph__flash_c) = fc1cb75a68d98327d072182447aa8183940d5f61 Added files: Index: pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_Common_UI_LineXX.cpp diff -u /dev/null pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_Common_UI_LineXX.cpp:1.1 --- /dev/null Tue May 26 11:25:34 2020 +++ pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_Common_UI_LineXX.cpp Tue May 26 11:25:34 2020 @@ -0,0 +1,29 @@ +$NetBSD: patch-plugins_actor_G-Force_Common_UI_LineXX.cpp,v 1.1 2020/05/26 11:25:34 joerg Exp $ + +--- plugins/actor/G-Force/Common/UI/LineXX.cpp.orig 2020-05-26 00:26:16.970444766 +0000 ++++ plugins/actor/G-Force/Common/UI/LineXX.cpp +@@ -74,13 +74,13 @@ + + + #if CLR_INTERP && P_SZ != 1 +- long len = sqrt( dx * dx + dy * dy ) + 1; ++ long len = sqrt( double(dx * dx + dy * dy) ) + 1; + dR /= len; + dG /= len; + dB /= len; + color = __Clr( R, G, B ); + #elif CLR_INTERP && P_SZ == 1 +- long len = sqrt( dx * dx + dy * dy ) + 1; ++ long len = sqrt( double(dx * dx + dy * dy) ) + 1; + dR /= len; + color = __Clr( R, G, B ); + #endif +@@ -154,7 +154,7 @@ + + for ( j = 0; j < tw; j++ ) { + long tmp = j - halfW; +- c_x = halfW - ( ( long ) sqrt( halfW * halfW - tmp * tmp ) ); ++ c_x = halfW - ( ( long ) sqrt(double( halfW * halfW - tmp * tmp )) ); + center = basePtr + (j-halfW) * mBytesPerRow; + for ( int k = c_x; k < tw - c_x; k++ ){ + ((PIXTYPE*) center)[k-halfW] = color; Index: pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_G-Force.cpp diff -u /dev/null pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_G-Force.cpp:1.1 --- /dev/null Tue May 26 11:25:34 2020 +++ pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_G-Force.cpp Tue May 26 11:25:34 2020 @@ -0,0 +1,22 @@ +$NetBSD: patch-plugins_actor_G-Force_GForceCommon_G-Force.cpp,v 1.1 2020/05/26 11:25:34 joerg Exp $ + +--- plugins/actor/G-Force/GForceCommon/G-Force.cpp.orig 2005-01-19 16:23:57.000000000 +0000 ++++ plugins/actor/G-Force/GForceCommon/G-Force.cpp +@@ -840,7 +840,7 @@ void GForce::ManageColorChanges() { + // If in a ColorMap transition/morph then we must set mColorTrans, for it's linked into mGF_Palette + if ( mColorTransTime > 0 ) { + float t = (float) ( mColorTransEnd - mT_MS ) / ( (float) mColorTransTime ); +- mColorTrans = pow( t, TRANSITION_ALPHA ); ++ mColorTrans = pow( t, float(TRANSITION_ALPHA) ); + } + + // Evaluate the palette at this time +@@ -1215,7 +1215,7 @@ void GForce::RecordSample( long inCurTim + // Is the text is about to expire? if not, continue drawing. + if ( t <= 1 ) { + +- intensity = 255.5 * pow( t, 1.5 ); ++ intensity = 255.5 * pow( t, 1.5f ); + mCurPort -> SetTextColor( mPalette[ intensity ] ); + mCurPort -> SetTrackTextFont(); + mCurPort -> DrawText( mTrackTextPos.h, mTrackTextPos.v, mTrackText ); } Index: pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_WaveShape.cpp diff -u /dev/null pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_WaveShape.cpp:1.1 --- /dev/null Tue May 26 11:25:34 2020 +++ pkgsrc/audio/libvisual0.2-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_WaveShape.cpp Tue May 26 11:25:34 2020 @@ -0,0 +1,22 @@ +$NetBSD: patch-plugins_actor_G-Force_GForceCommon_WaveShape.cpp,v 1.1 2020/05/26 11:25:34 joerg Exp $ + +--- plugins/actor/G-Force/GForceCommon/WaveShape.cpp.orig 2005-01-17 18:45:25.000000000 +0000 ++++ plugins/actor/G-Force/GForceCommon/WaveShape.cpp +@@ -204,7 +204,7 @@ void WaveShape::Draw( long inNumSteps, P + else { + w2Waves = inWave2 -> mNumWaves; + dialate = inMorphPct; +- mShapeTrans = pow( dialate, SHAPE_MORPH_ALPHA ); ++ mShapeTrans = pow( dialate, float(SHAPE_MORPH_ALPHA) ); + SetupFrame( inWave2, mShapeTrans ); + + if ( mNumWaves > w2Waves ) { +@@ -214,7 +214,7 @@ void WaveShape::Draw( long inNumSteps, P + maxWaves = w2Waves; + + // Set the wave scale factor to the wave leaving/arriving +- dialate = 20.0 * pow( dialate, 4.0 ) + 1.0; ++ dialate = 20.0 * pow( dialate, 4.0f ) + 1.0; + + // Calc the x and y scale factors for wave 2 + xscaleW2 = xoff; --_----------=_159049233458400--