Re: cvs: php4 /ext/exif exif.c

It'll evaluate differently - it's not obvious, because it won't happen :) It'll be b||c first, and a && (b||c) later. Zeev At 17:46 02/03/2002, Rasmus Lerdorf wrote:

What do you mean wrong brackets? Your new version will evaluate the same way, although now it is just not as obvious that the a && b expression will be done before the || c On Sat, 2 Mar 2002, Marcus Börger wrote:

helly         Sat Mar  2 10:43:20 2002 EDT

Modified files:

    /php4/ext/exif    exif.c

Log: Wrong brackets by rasmus...but sorry the fault was mine because i missed them... i also decided to call the first working version 1.0a by the way: currently i am working on tiff files and it looks like it may work Index: php4/ext/exif/exif.c diff -u php4/ext/exif/exif.c:1.41 php4/ext/exif/exif.c:1.42 --- php4/ext/exif/exif.c:1.41 Sat Mar 2 03:37:28 2002

+++ php4/ext/exif/exif.c      Sat Mar  2 10:43:19 2002

@@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: exif.c,v 1.41 2002/03/02 08:37:28 rasmus Exp $ */ +/* $Id: exif.c,v 1.42 2002/03/02 15:43:19 helly Exp $ */ /* Much of the code in this module was borrowed from the public domain

      jhead.c package with the author's consent.  The main changes have been

@@ -178,7 +178,7 @@ }; /* }}} */ -#define EXIF_VERSION "2.0a $Revision: 1.41 $" +#define EXIF_VERSION "1.0a $Revision: 1.42 $" PHP_MINFO_FUNCTION(exif); @@ -634,7 +634,7 @@

      char  mbBuffer[MB_CUR_MAX];

      /* Copy the comment */
-     if ( ((ByteCount>8) && !memcmp(szValuePtr, "UNICODE\0", 8)) || !memcmp(szValuePtr, "JIS\0\0\0\0\0", 8)) {
+     if ( (ByteCount>8) && (!memcmp(szValuePtr, "UNICODE\0", 8) || !memcmp(szValuePtr, "JIS\0\0\0\0\0", 8))) {
              /* treat JIS encoding as if it where UNICODE */
              szValuePtr = szValuePtr+8;
              ByteCount -= 8;

-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php