head 1.5; access; symbols pkgsrc-2014Q2:1.3.0.66 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.64 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.62 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.60 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.58 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.56 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.54 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.52 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.50 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.48 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.46 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.44 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.42 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.3.0.40 pkgsrc-2011Q1-base:1.3 pkgsrc-2010Q4:1.3.0.38 pkgsrc-2010Q4-base:1.3 pkgsrc-2010Q3:1.3.0.36 pkgsrc-2010Q3-base:1.3 pkgsrc-2010Q2:1.3.0.34 pkgsrc-2010Q2-base:1.3 pkgsrc-2010Q1:1.3.0.32 pkgsrc-2010Q1-base:1.3 pkgsrc-2009Q4:1.3.0.30 pkgsrc-2009Q4-base:1.3 pkgsrc-2009Q3:1.3.0.28 pkgsrc-2009Q3-base:1.3 pkgsrc-2009Q2:1.3.0.26 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.24 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.22 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.20 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.18 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.16 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.14 pkgsrc-2008Q1:1.3.0.12 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.10 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.8 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.3.0.6 pkgsrc-2007Q2-base:1.3 pkgsrc-2007Q1:1.3.0.4 pkgsrc-2007Q1-base:1.3 pkgsrc-2006Q4:1.3.0.2 pkgsrc-2006Q4-base:1.3 pkgsrc-2006Q3:1.2.0.24 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.22 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.20 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.18 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.16 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.14 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.12 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.10 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.8 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.6 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.2.0.4 pkgsrc-2004Q1-base:1.2 pkgsrc-2003Q4:1.2.0.2 pkgsrc-2003Q4-base:1.2 buildlink2-base:1.2 netbsd-1-4-PATCH002:1.1 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1 netbsd-1-4-RELEASE:1.1; locks; strict; comment @# @; 1.5 date 2014.09.08.21.22.29; author wiz; state dead; branches; next 1.4; commitid 0IuhkyUPMU5rtAPx; 1.4 date 2014.08.25.08.23.22; author wiz; state Exp; branches; next 1.3; commitid JZNX8Fr2LhvjCINx; 1.3 date 2006.10.03.22.56.51; author schwarz; state Exp; branches; next 1.2; 1.2 date 2000.05.17.10.13.23; author tron; state dead; branches; next 1.1; 1.1 date 99.01.10.23.52.17; author tron; state Exp; branches; next ; desc @@ 1.5 log @Update to 10.67.03. This is the current release of the Advanced branch of netpbm. Lots and lots of changes since our Super Stable release version. @ text @$NetBSD: patch-aw,v 1.4 2014/08/25 08:23:22 wiz Exp $ Use CPPFLAGS from environment. Already included in current Advanced release. --- lib/Makefile.orig 2006-10-03 20:55:25.000000000 +0200 +++ lib/Makefile 2006-10-03 20:55:56.000000000 +0200 @@@@ -81,7 +81,7 @@@@ $(LIBOBJECTS): %.o: %.c importinc # Note that the user may have configured -I options into CFLAGS. $(CC) -c $(INCLUDES) -DNDEBUG $(CFLAGS) $(CFLAGS_SHLIB) \ - $(CFLAGS_PERSONAL) $(CADD) -o $@@ $< + $(CFLAGS_PERSONAL) $(CPPFLAGS) $(CADD) -o $@@ $< MAJ = $(NETPBM_MAJOR_RELEASE) MIN = $(NETPBM_MINOR_RELEASE) @ 1.4 log @Remove two patches/chunks for ancient problems. Update patch status for the ones that are in upstream releases/will be included soon. @ text @d1 1 a1 1 $NetBSD: patch-aw,v 1.3 2006/10/03 22:56:51 schwarz Exp $ @ 1.3 log @ added support for IRIX 5 and in particular the SGI IDO cc. patches were discussed with Bryan Henderson, maintainer of the netpbm code. @ text @d1 4 a4 1 $NetBSD$ @ 1.2 log @Update "netpbm" package to version 9.2. There are too many changes and bug fixes to list here. Main new features are shared libraries, JPEG and JBIG support. @ text @d1 1 a1 1 $NetBSD: patch-aw,v 1.1 1999/01/10 23:52:17 tron Exp $ d3 8 a10 22 --- pnm/tifftopnm.c.orig Mon Oct 4 10:12:01 1993 +++ pnm/tifftopnm.c Sun Jan 10 23:48:40 1999 @@@@ -54,7 +54,7 @@@@ int headerdump; register u_char sample; register int bitsleft; - unsigned short bps, spp, photomet; + unsigned short bps, spp, photomet, planarconfig; unsigned short* redcolormap; unsigned short* greencolormap; unsigned short* bluecolormap; @@@@ -101,6 +101,13 @@@@ spp = 1; if ( ! TIFFGetField( tif, TIFFTAG_PHOTOMETRIC, &photomet ) ) pm_error( "error getting photometric" ); + if( spp > 1 ){ + if ( ! TIFFGetField( tif, TIFFTAG_PLANARCONFIG, &planarconfig ) ) + pm_error( "error getting planarconfig" ); + }else{ + planarconfig = PLANARCONFIG_CONTIG; + } + d12 2 a13 90 switch ( spp ) { @@@@ -114,6 +121,18 @@@@ "can only handle 1-channel gray scale or 1- or 3-channel color" ); } + switch( planarconfig ) + { + case PLANARCONFIG_CONTIG: + break; + case PLANARCONFIG_SEPARATE: + if( photomet != PHOTOMETRIC_RGB ) + pm_error( "can only handle separate planes with RGB data" ); + break; + default: + pm_error("Unrecongnized PLANARCONFIG tag!\n"); + } + (void) TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &cols ); (void) TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &rows ); @@@@ -259,20 +278,54 @@@@ break; case PHOTOMETRIC_RGB: - for ( col = 0; col < cols; ++col, ++xP ) - { - register xelval r, g, b; - - NEXTSAMPLE - r = sample; - NEXTSAMPLE - g = sample; - NEXTSAMPLE - b = sample; - if ( spp == 4 ) - NEXTSAMPLE /* skip alpha channel */ - PPM_ASSIGN( *xP, r, g, b ); - } + if( planarconfig == PLANARCONFIG_CONTIG ){ + for ( col = 0; col < cols; ++col, ++xP ) + { + register xelval r, g, b; + + NEXTSAMPLE + r = sample; + NEXTSAMPLE + g = sample; + NEXTSAMPLE + b = sample; + if ( spp == 4 ) + NEXTSAMPLE /* skip alpha channel */ + PPM_ASSIGN( *xP, r, g, b ); + } + }else{ + /* First clear the value and assign the reds */ + for ( col = 0; col < cols; ++col, ++xP ) + { + NEXTSAMPLE + PPM_ASSIGN( *xP, 0, 0, 0 ); + PPM_PUTR( *xP, sample ); + } + + /* Next the greens */ + if ( TIFFReadScanline( tif, buf, row, 1 ) < 0 ) + pm_error( "bad data read on green line %d", row ); + xP = xelrow; + inP = buf; + bitsleft = 8; + for ( col = 0; col < cols; ++col, ++xP ) + { + NEXTSAMPLE + PPM_PUTG( *xP, sample ); + } + + /* And finally the blues */ + if ( TIFFReadScanline( tif, buf, row, 2 ) < 0 ) + pm_error( "bad data read on green line %d", row ); + xP = xelrow; + inP = buf; + bitsleft = 8; + for ( col = 0; col < cols; ++col, ++xP ) + { + NEXTSAMPLE + PPM_PUTB( *xP, sample ); + } + } break; default: @ 1.1 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 @d1 1 a1 1 $NetBSD$ @