From 76c56f4572a2f3c5e5b6d91bfaf25ed84724007c Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 31 Aug 2005 19:47:53 +0000 Subject: Add patch that fixes error: invalid lvalue in assignment in editor/pnmaddnoise.c. This was noticed on DragonFly with gcc 3.4.5. Found idea from DarwinPorts. Also tested on NetBSD 2.0.2 (gcc 3.3.3) and Linux (gcc 3.3.5). I do not know if this is improved in netpbm upstream yet. Okay'ed by maintainer. --- graphics/netpbm/distinfo | 3 +- graphics/netpbm/patches/patch-ad | 137 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 graphics/netpbm/patches/patch-ad (limited to 'graphics') diff --git a/graphics/netpbm/distinfo b/graphics/netpbm/distinfo index 44346b83996..7bfc73bf52e 100644 --- a/graphics/netpbm/distinfo +++ b/graphics/netpbm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.42 2005/08/31 08:04:58 jlam Exp $ +$NetBSD: distinfo,v 1.43 2005/08/31 19:47:53 reed Exp $ SHA1 (netpbm-10.29.tgz) = 0733a0e1a7413e48eeb060aed1d1cc326e12ef8d RMD160 (netpbm-10.29.tgz) = c88d01b1106c7eb1f087d98a5570c0c61200d083 @@ -6,6 +6,7 @@ Size (netpbm-10.29.tgz) = 2359729 bytes SHA1 (patch-aa) = 113be91facd060cd4b788db9df30d0f1f55d6bcb SHA1 (patch-ab) = 900c36d6ab145c807ecb3dec6b77ae2ad50d4dad SHA1 (patch-ac) = 07f109139bf30da22b05d00189cbb7b4a5f8f05a +SHA1 (patch-ad) = 7393993077852e845c1bec14227347b39e973c83 SHA1 (patch-ae) = 33a5be2843dd85b530f5e6ba496cd0380cd5edd1 SHA1 (patch-af) = 82e366af1c8b644cf374706c2eb113c370447de9 SHA1 (patch-ah) = be2ebb908859da6e030b04acb9e33b6c774137ad diff --git a/graphics/netpbm/patches/patch-ad b/graphics/netpbm/patches/patch-ad new file mode 100644 index 00000000000..bc27a9bcdff --- /dev/null +++ b/graphics/netpbm/patches/patch-ad @@ -0,0 +1,137 @@ +$NetBSD: patch-ad,v 1.18 2005/08/31 19:47:53 reed Exp $ + +Fixes error: invalid lvalue in assignment +Found idea from DarwinPorts + +--- editor/pnmaddnoise.c.orig 2005-08-31 01:14:52.000000000 -0700 ++++ editor/pnmaddnoise.c 2005-08-31 01:31:56.000000000 -0700 +@@ -252,14 +252,14 @@ + int rows, cols, format, row; + double rtemp, gtemp, btemp; + double u, u1; +- double INFINITY; ++ double infinity; + + double const EPSILON = 1.0e-5; + int const forceplain = 0; + + pnm_readpnminit( ifp, &cols, &rows, &maxval, &format ); + xelrow = pnm_allocrow( cols ); +- INFINITY = (double) maxval; ++ infinity = (double) maxval; + + pnm_writepnminit( stdout, cols, rows, maxval, format, forceplain ); + +@@ -272,12 +272,12 @@ + u = ( rand( ) & RANDOM_MASK ) / arand; + if ( u <= 0.5 ) { + if ( u <= EPSILON ) +- rtemp = PPM_GETR( *xP ) - INFINITY; ++ rtemp = PPM_GETR( *xP ) - infinity; + else + rtemp = PPM_GETR( *xP ) + lsigma * log( 2.0 * u ); + } else { + if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON ) +- rtemp = PPM_GETR( *xP ) + INFINITY; ++ rtemp = PPM_GETR( *xP ) + infinity; + else + rtemp = PPM_GETR( *xP ) - lsigma * log( 2.0 * u1 ); + } +@@ -285,12 +285,12 @@ + u = ( rand( ) & RANDOM_MASK ) / arand; + if ( u <= 0.5 ) { + if ( u <= EPSILON ) +- gtemp = PPM_GETG( *xP ) - INFINITY; ++ gtemp = PPM_GETG( *xP ) - infinity; + else + gtemp = PPM_GETG( *xP ) + lsigma * log( 2.0 * u ); + } else { + if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON ) +- gtemp = PPM_GETG( *xP ) + INFINITY; ++ gtemp = PPM_GETG( *xP ) + infinity; + else + gtemp = PPM_GETG( *xP ) - lsigma * log( 2.0 * u1 ); + } +@@ -298,12 +298,12 @@ + u = ( rand( ) & RANDOM_MASK ) / arand; + if ( u <= 0.5 ) { + if ( u <= EPSILON ) +- btemp = PPM_GETB( *xP ) - INFINITY; ++ btemp = PPM_GETB( *xP ) - infinity; + else + btemp = PPM_GETB( *xP ) + lsigma * log( 2.0 * u ); + } else { + if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON ) +- btemp = PPM_GETB( *xP ) + INFINITY; ++ btemp = PPM_GETB( *xP ) + infinity; + else + btemp = PPM_GETB( *xP ) - lsigma * log( 2.0 * u1 ); + } +@@ -318,12 +318,12 @@ + u = ( rand( ) & RANDOM_MASK ) / arand; + if ( u <= 0.5 ) { + if ( u <= EPSILON ) +- gtemp = PNM_GET1( *xP ) - INFINITY; ++ gtemp = PNM_GET1( *xP ) - infinity; + else + gtemp = PNM_GET1( *xP ) + lsigma * log( 2.0 * u ); + } else { + if ( ( u1 = 1.0 - u ) <= 0.5 * EPSILON ) +- gtemp = PNM_GET1( *xP ) + INFINITY; ++ gtemp = PNM_GET1( *xP ) + infinity; + else + gtemp = PNM_GET1( *xP ) - lsigma * log( 2.0 * u1 ); + } +@@ -356,14 +356,14 @@ + int rows, cols, format, row; + double rtemp, gtemp, btemp; + double uniform, rayleigh, gauss; +- double INFINITY; ++ double infinity; + + double const EPSILON = 1.0e-5; + int const forceplain = 0; + + pnm_readpnminit( ifp, &cols, &rows, &maxval, &format ); + xelrow = pnm_allocrow( cols ); +- INFINITY = (double) maxval; ++ infinity = (double) maxval; + + pnm_writepnminit( stdout, cols, rows, maxval, format, forceplain ); + +@@ -375,7 +375,7 @@ + case PPM_TYPE: + uniform = ( rand( ) & RANDOM_MASK ) / arand; + if ( uniform <= EPSILON ) +- rayleigh = INFINITY; ++ rayleigh = infinity; + else + rayleigh = sqrt( -2.0 * log( uniform ) ); + uniform = ( rand( ) & RANDOM_MASK ) / arand; +@@ -384,7 +384,7 @@ + + uniform = ( rand( ) & RANDOM_MASK ) / arand; + if ( uniform <= EPSILON ) +- rayleigh = INFINITY; ++ rayleigh = infinity; + else + rayleigh = sqrt( -2.0 * log( uniform ) ); + uniform = ( rand( ) & RANDOM_MASK ) / arand; +@@ -393,7 +393,7 @@ + + uniform = ( rand( ) & RANDOM_MASK ) / arand; + if ( uniform <= EPSILON ) +- rayleigh = INFINITY; ++ rayleigh = infinity; + else + rayleigh = sqrt( -2.0 * log( uniform ) ); + uniform = ( rand( ) & RANDOM_MASK ) / arand; +@@ -409,7 +409,7 @@ + default: + uniform = ( rand( ) & RANDOM_MASK ) / arand; + if ( uniform <= EPSILON ) +- rayleigh = INFINITY; ++ rayleigh = infinity; + else + rayleigh = sqrt( -2.0 * log( uniform ) ); + uniform = ( rand( ) & RANDOM_MASK ) / arand; -- cgit v1.2.3