- add patches forgotten in last commit
This commit is contained in:
brad 1999-06-01 22:36:10 +00:00
parent f824f78f95
commit d0a6917db7
2 changed files with 37 additions and 0 deletions

View File

@ -0,0 +1,18 @@
--- ppm/libppm4.c.orig Tue Jun 1 08:58:17 1999
+++ ppm/libppm4.c Tue Jun 1 09:00:08 1999
@@ -217,6 +217,7 @@
#endif /* A_RGBENV */
canonstr( colorname );
while ( fgets( buf1, sizeof(buf1), f ) != NULL )
+ if (buf1[0] != '!')
{
if ( sscanf( buf1, "%ld %ld %ld %[^\n]", &r, &g, &b, buf2 ) != 4 )
{
@@ -298,6 +299,7 @@
#endif /* A_RGBENV */
best_diff = 32767;
while ( fgets( buf, sizeof(buf), f ) != NULL )
+ if (buf[0] != '!')
{
if ( sscanf( buf, "%d %d %d %[^\n]", &this_r, &this_g, &this_b,
this_colorname ) != 4 )

View File

@ -0,0 +1,19 @@
--- pbm/xbmtopbm.c.orig Tue Jun 1 09:01:56 1999
+++ pbm/xbmtopbm.c Tue Jun 1 09:03:57 1999
@@ -116,6 +116,16 @@
version10 = 0;
break;
}
+ if ( sscanf( line, "static unsigned short %s = {", name_and_type ) == 1 ) /* } */
+ {
+ version10 = 1;
+ break;
+ }
+ if ( sscanf( line, "static unsigned char %s = {", name_and_type ) == 1 ) /* } */
+ {
+ version10 = 0;
+ break;
+ }
}
if ( *widthP == -1 )