cvs: php4(PHP_4_2_0) /ext/standard image.c

helly Tue Mar 12 00:57:28 2002 EDT Modified files: (Branch: PHP_4_2_0) /php4/ext/standard image.c Log: -merged a wrong line #this comes later, i left the documentation onthat) -one compiling issue #maybe some comilers get angry on the old form Index: php4/ext/standard/image.c diff -u php4/ext/standard/image.c:1.44.2.1 php4/ext/standard/image.c:1.44.2.2 --- php4/ext/standard/image.c:1.44.2.1 Mon Mar 11 14:04:29 2002 +++ php4/ext/standard/image.c Tue Mar 12 00:57:28 2002 @@ -16,7 +16,7 @@ | Marcus Boerger <helly@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: image.c,v 1.44.2.1 2002/03/11 19:04:29 helly Exp $ */ +/* $Id: image.c,v 1.44.2.2 2002/03/12 05:57:28 helly Exp $ */ /* * Based on Daniel Schmitt's imageinfo.c which carried the following * Copyright notice. @@ -269,7 +269,9 @@ return M_EOI; /* we hit EOF */ if (++a >= 10) return M_EOI; } while (c == 0xff); - if (a<2) c = M_EOI; /* at least one 0xff is needed before marker code */ +/* if (a<2) c = M_EOI; at least one 0xff is needed before marker code */ +/* this test will be enabled in 4.3 because we must know if we already */ +/* handled the 0xff from image-start. */ return (unsigned int) c; } /* }}} */ @@ -294,7 +296,8 @@ * skip over a variable-length block; assumes proper length marker */ static void php_skip_variable(int socketd, FILE *fp, int issock) { - php_skip_over( socketd, fp, issock, php_read2(socketd, fp, issock)-2); + size_t length = php_read2(socketd, fp, issock); /* compiler issue */ + php_skip_over( socketd, fp, issock, length-2); } /* }}} */