Tue May 26 11:25:02 2020 UTC ()
Disambiguate pow.


(joerg)
diff -r1.12 -r1.13 pkgsrc/audio/libvisual-plugins/distinfo
diff -r0 -r1.1 pkgsrc/audio/libvisual-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_G-Force.cpp
diff -r0 -r1.1 pkgsrc/audio/libvisual-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_WaveShape.cpp
cvs diff -r1.12 -r1.13 pkgsrc/audio/libvisual-plugins/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/libvisual-plugins/distinfo 2015/11/03 01:12:39 1.12
+++ pkgsrc/audio/libvisual-plugins/distinfo 2020/05/26 11:25:02 1.13
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1$NetBSD: distinfo,v 1.12 2015/11/03 01:12:39 agc Exp $ 1$NetBSD: distinfo,v 1.13 2020/05/26 11:25:02 joerg Exp $
2 2
3SHA1 (libvisual-plugins-0.4.0.tar.gz) = 20490573c282d900ec0bd05133cb3707640254f5 3SHA1 (libvisual-plugins-0.4.0.tar.gz) = 20490573c282d900ec0bd05133cb3707640254f5
4RMD160 (libvisual-plugins-0.4.0.tar.gz) = f7a82f4a9e4dec3e877833612ece570ffbf2404d 4RMD160 (libvisual-plugins-0.4.0.tar.gz) = f7a82f4a9e4dec3e877833612ece570ffbf2404d
5SHA512 (libvisual-plugins-0.4.0.tar.gz) = f8666b548bc04e8b9ab69a37bdd5483080c820115903aabaa629bb0bd0fa8424969ee596e6e66bb90d8e62d6e14513fd57f85c1b5e7e074792cfa94638134901 5SHA512 (libvisual-plugins-0.4.0.tar.gz) = f8666b548bc04e8b9ab69a37bdd5483080c820115903aabaa629bb0bd0fa8424969ee596e6e66bb90d8e62d6e14513fd57f85c1b5e7e074792cfa94638134901
6Size (libvisual-plugins-0.4.0.tar.gz) = 828631 bytes 6Size (libvisual-plugins-0.4.0.tar.gz) = 828631 bytes
7SHA1 (patch-aa) = 9c84c7d8af69d603ea8ce4077247a217952c0cb3 7SHA1 (patch-aa) = 9c84c7d8af69d603ea8ce4077247a217952c0cb3
8SHA1 (patch-ab) = 31a380ed59ed9eed1e5516c44fec54c1e7dcf25c 8SHA1 (patch-ab) = 31a380ed59ed9eed1e5516c44fec54c1e7dcf25c
9SHA1 (patch-ac) = b431acd28d9ff7c8bf5a8655fe4969f08ad80772 9SHA1 (patch-ac) = b431acd28d9ff7c8bf5a8655fe4969f08ad80772
10SHA1 (patch-ad) = 9f9adc7bc9074b6474b83a245be67f1db753d645 10SHA1 (patch-ad) = 9f9adc7bc9074b6474b83a245be67f1db753d645
11SHA1 (patch-ae) = ce54b7682f0d7a184a15392ee8f3a7cd2510be13 11SHA1 (patch-ae) = ce54b7682f0d7a184a15392ee8f3a7cd2510be13
12SHA1 (patch-af) = 35e2b6517a7c7bd5605fd6593a113f184d8dc1b3 12SHA1 (patch-af) = 35e2b6517a7c7bd5605fd6593a113f184d8dc1b3
13SHA1 (patch-plugins_actor_G-Force_Common_GeneralTools_UtilStr.cpp) = 6dfb4d2d8ba5ed6be37523b66515df630bfba604 13SHA1 (patch-plugins_actor_G-Force_Common_GeneralTools_UtilStr.cpp) = 6dfb4d2d8ba5ed6be37523b66515df630bfba604
14SHA1 (patch-plugins_actor_G-Force_Common_UI_LineXX.cpp) = f0e527dd7bc2918fbab00846cbf3c7c882ba82eb 14SHA1 (patch-plugins_actor_G-Force_Common_UI_LineXX.cpp) = f0e527dd7bc2918fbab00846cbf3c7c882ba82eb
 15SHA1 (patch-plugins_actor_G-Force_GForceCommon_G-Force.cpp) = 3db98e9132c816383060b526c87f57f3caa00b1b
 16SHA1 (patch-plugins_actor_G-Force_GForceCommon_WaveShape.cpp) = 84d1ed2e062f136aef268ed9445aabdc2a42080c
15SHA1 (patch-plugins_actor_corona_corona.cpp) = 89292f12be75a59a62f7a52c660a1146fda8f1e5 17SHA1 (patch-plugins_actor_corona_corona.cpp) = 89292f12be75a59a62f7a52c660a1146fda8f1e5
16SHA1 (patch-plugins_morph_flash_morph__flash_c) = 94d696aa43213fa43fb98a563cdc040d5fe9a92c 18SHA1 (patch-plugins_morph_flash_morph__flash_c) = 94d696aa43213fa43fb98a563cdc040d5fe9a92c
File Added: pkgsrc/audio/libvisual-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_G-Force.cpp
$NetBSD: patch-plugins_actor_G-Force_GForceCommon_G-Force.cpp,v 1.1 2020/05/26 11:25:02 joerg Exp $

--- plugins/actor/G-Force/GForceCommon/G-Force.cpp.orig	2020-05-26 00:17:08.719115589 +0000
+++ plugins/actor/G-Force/GForceCommon/G-Force.cpp
@@ -624,7 +624,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	
@@ -983,7 +983,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 ); }
File Added: pkgsrc/audio/libvisual-plugins/patches/patch-plugins_actor_G-Force_GForceCommon_WaveShape.cpp
$NetBSD: patch-plugins_actor_G-Force_GForceCommon_WaveShape.cpp,v 1.1 2020/05/26 11:25:02 joerg Exp $

--- plugins/actor/G-Force/GForceCommon/WaveShape.cpp.orig	2020-05-26 00:18:26.285232815 +0000
+++ plugins/actor/G-Force/GForceCommon/WaveShape.cpp
@@ -202,7 +202,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 ) {
@@ -212,7 +212,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;