head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.54
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.52
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.50
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.48
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.46
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.44
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.42
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.40
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.38
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.36
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.34
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.32
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.30
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.28
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.26
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.24
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.22
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.20
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.18
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.16
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.14
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.12
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.10
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.8
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.6
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.4
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.2
	pkgsrc-2003Q4-base:1.3
	buildlink2-base:1.3
	netbsd-1-3-PATCH003:1.2;
locks; strict;
comment	@# @;


1.3
date	99.01.10.23.52.18;	author tron;	state dead;
branches;
next	1.2;

1.2
date	98.08.07.10.40.51;	author agc;	state Exp;
branches;
next	1.1;

1.1
date	98.07.15.19.52.56;	author tron;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Major cleanup of "netpbm" package based on patches supply by
John F. Woods in PR pkg/6763 and Rob Windsor in PR pkg/6779.
@
text
@$NetBSD: patch-bi,v 1.2 1998/08/07 10:40:51 agc Exp $

--- ./pnm/pnmarith.c.orig	Sun Aug 13 00:04:38 1995
+++ ./pnm/pnmarith.c	Sun Aug 13 00:08:04 1995
@@@@ -29,7 +29,8 @@@@
     xelval maxval1, maxval2, maxval3;
     int argn, rows1, cols1, format1, rows2, cols2, format2, format3, row, col;
     char function;
-    char* usage = "-add|-subtract|-multiply|-difference pnmfile1 pnmfile2";
+    char* usage =
+"-add|-subtract|-multiply|-difference|-minimum|-maximum pnmfile1 pnmfile2";
 
 
     pnm_init( &argc, argv );
@@@@ -48,6 +49,10 @@@@
 	    function = '*';
 	else if ( pm_keymatch( argv[argn], "-difference", 2 ) )
 	    function = 'D';
+	else if ( pm_keymatch( argv[argn], "-minimum", 2 ) )
+	    function = 'N';
+	else if ( pm_keymatch( argv[argn], "-maximum", 2 ) )
+	    function = 'X';
 	else
 	    pm_usage( usage );
 	++argn;
@@@@ -112,7 +117,7 @@@@
 	    pnm_promoteformatrow(
 		xelrow2, cols1, maxval2, format2, maxval3, format3 );
 
-        for ( col = 0, x1P = xelrow1, x2P = xelrow2;
+	for ( col = 0, x1P = xelrow1, x2P = xelrow2;
 	      col < cols1; ++col, ++x1P, ++x2P )
 	    {
 	    switch ( PNM_FORMAT_TYPE(format3) )
@@@@ -153,6 +158,18 @@@@
 		    b1 = (b1>b2)?(b1-b2):(b2-b1);
 		    break;
 
+		    case 'N':
+		    r1 = (r1>r2)?(r2):(r1);
+		    g1 = (g1>g2)?(g2):(g1);
+		    b1 = (b1>b2)?(b2):(b1);
+		    break;
+  
+		    case 'X':
+		    r1 = (r1>r2)?(r1):(r2);
+		    g1 = (g1>g2)?(g1):(g2);
+		    b1 = (b1>b2)?(b1):(b2);
+		    break;
+
 		    default:
 		    pm_error( "can't happen" );
 		    }
@@@@ -188,6 +205,14 @@@@
 
 		    case 'D':
 		    g1 = (g1>g2)?(g1-g2):(g2-g1);
+		    break;
+
+		    case 'N':
+		    g1 = (g1>g2)?(g2):(g1);
+		    break;
+  
+		    case 'X':
+		    g1 = (g1>g2)?(g1):(g2);
 		    break;
 
 		    default:
@


1.2
log
@Add NetBSD RCS Ids.
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Add well known fixes for "netpbm-1mar1994" supplied by John F. Woods
in PR pkg/5723.
@
text
@d1 2
@