From:	CRDGW2::CRDGW2::MRGATE::"SMTP::CRVAX.SRI.COM::RELAY-INFO-VAX" 23-AUG-1990 22:12:27.70
To:	MRGATE::"ARISIA::EVERHART"
CC:	
Subj:	PBMPLUS patches 3/3

Received:  by crdgw1.ge.com (5.57/GE 1.70)
	 id AA14489; Thu, 23 Aug 90 21:57:07 EDT
Received: From UCBVAX.BERKELEY.EDU by CRVAX.SRI.COM with TCP; Thu, 23 AUG 90 14:06:02 PDT
Received: by ucbvax.Berkeley.EDU (5.63/1.42)
	id AA22456; Thu, 23 Aug 90 13:52:30 -0700
Received: from USENET by ucbvax.Berkeley.EDU with netnews
	for info-vax@kl.sri.com (info-vax@kl.sri.com)
	(contact usenet@ucbvax.Berkeley.EDU if you have questions)
Date: 23 Aug 90 14:00:21 GMT
From: maverick.ksu.ksu.edu!deimos.cis.ksu.edu!mccall!tp@uunet.uu.net
Organization: The McCall Pattern Co., Manhattan, KS, USA
Subject: PBMPLUS patches 3/3
Message-Id: <23.26d3e175@mccall.com>
Sender: info-vax-request@kl.sri.com
To: info-vax@kl.sri.com

Submitted-by: tp@mccall.com (Terry Poot)
Archive-name: pbmplus/patch2-part3

Move to the ppm subdirectory of the PBMPLUS tree to apply this patch. It
patches the programs ppmrotate, ppmscale, and ppmshear. Remember to reverse
my previous patch if you've already applied it, BEFORE applying this patch.

*** ppmrotate.c;-1
--- ppmrotate.c
**************
*** 43,49
  
      if ( argn == argc )
  	pm_usage( usage );
!     if ( sscanf( argv[argn], "%g", &fangle ) != 1 )
  	pm_usage( usage );
      argn++;
      if ( fangle < -90.0 || fangle > 90.0 )
--- 43,49 -----
  
      if ( argn == argc )
  	pm_usage( usage );
!     if ( sscanf( argv[argn], "%f", &fangle ) != 1 )
  	pm_usage( usage );
      argn++;
      if ( fangle < -90.0 || fangle > 90.0 )
*** ppmscale.c;-1
--- ppmscale.c
**************
*** 57,63
  		pm_error(
  		    "only one of -xsize/-width and -xscale may be specified",
  		    0,0,0,0,0 );
! 	    if ( sscanf( argv[argn+1], "%g", &xscale ) != 1 )
  		pm_usage( usage );
  	    if ( xscale <= 0.0 )
  		pm_error( "x scale must be greater than 0", 0,0,0,0,0 );
--- 57,63 -----
  		pm_error(
  		    "only one of -xsize/-width and -xscale may be specified",
  		    0,0,0,0,0 );
! 	    if ( sscanf( argv[argn+1], "%f", &xscale ) != 1 )
  		pm_usage( usage );
  	    if ( xscale <= 0.0 )
  		pm_error( "x scale must be greater than 0", 0,0,0,0,0 );
**************
*** 69,75
  		pm_error(
  		    "only one of -ysize/-height and -yscale may be specified",
  		    0,0,0,0,0 );
! 	    if ( sscanf( argv[argn+1], "%g", &yscale ) != 1 )
  		pm_usage( usage );
  	    if ( yscale <= 0.0 )
  		pm_error( "y scale must be greater than 0", 0,0,0,0,0 );
--- 69,75 -----
  		pm_error(
  		    "only one of -ysize/-height and -yscale may be specified",
  		    0,0,0,0,0 );
! 	    if ( sscanf( argv[argn+1], "%f", &yscale ) != 1 )
  		pm_usage( usage );
  	    if ( yscale <= 0.0 )
  		pm_error( "y scale must be greater than 0", 0,0,0,0,0 );
**************
*** 111,117
  	/* No flags specified, so a single scale factor is required. */
  	if ( argn == argc )
  	    pm_usage( usage );
! 	if ( sscanf( argv[argn], "%g", &xscale ) != 1 )
  	    pm_usage( usage );
  	if ( xscale <= 0.0 )
  	    pm_error( "scale must be greater than 0", 0,0,0,0,0 );
--- 111,117 -----
  	/* No flags specified, so a single scale factor is required. */
  	if ( argn == argc )
  	    pm_usage( usage );
! 	if ( sscanf( argv[argn], "%f", &xscale ) != 1 )
  	    pm_usage( usage );
  	if ( xscale <= 0.0 )
  	    pm_error( "scale must be greater than 0", 0,0,0,0,0 );
*** ppmshear.c;-1
--- ppmshear.c
**************
*** 43,49
  
      if ( argn == argc )
  	pm_usage( usage );
!     if ( sscanf( argv[argn], "%g", &fangle ) != 1 )
  	pm_usage( usage );
      argn++;
      if ( fangle <= -90.0 || fangle >= 90.0 )
--- 43,49 -----
  
      if ( argn == argc )
  	pm_usage( usage );
!     if ( sscanf( argv[argn], "%f", &fangle ) != 1 )
  	pm_usage( usage );
      argn++;
      if ( fangle <= -90.0 || fangle >= 90.0 )


-- 
Terry Poot <tp@mccall.com>                The McCall Pattern Company
(uucp: ...!rutgers!ksuvax1!mccall!tp)     615 McCall Road
(800)255-2762, in KS (913)776-4041        Manhattan, KS 66502, USA

