jani            Sun Aug  3 12:11:07 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/exif   exif.c 
  Log:
  MFH
  
http://cvs.php.net/viewvc.cgi/php-src/ext/exif/exif.c?r1=1.173.2.5.2.20.2.7&r2=1.173.2.5.2.20.2.8&diff_format=u
Index: php-src/ext/exif/exif.c
diff -u php-src/ext/exif/exif.c:1.173.2.5.2.20.2.7 
php-src/ext/exif/exif.c:1.173.2.5.2.20.2.8
--- php-src/ext/exif/exif.c:1.173.2.5.2.20.2.7  Tue Jul  1 07:39:33 2008
+++ php-src/ext/exif/exif.c     Sun Aug  3 12:11:07 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: exif.c,v 1.173.2.5.2.20.2.7 2008/07/01 07:39:33 tony2001 Exp $ */
+/* $Id: exif.c,v 1.173.2.5.2.20.2.8 2008/08/03 12:11:07 jani Exp $ */
 
 /*  ToDos
  *
@@ -142,7 +142,7 @@
 };
 /* }}} */
 
-#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.7 2008/07/01 07:39:33 
tony2001 Exp $"
+#define EXIF_VERSION "1.4 $Id: exif.c,v 1.173.2.5.2.20.2.8 2008/08/03 12:11:07 
jani Exp $"
 
 /* {{{ PHP_MINFO_FUNCTION
  */
@@ -2860,11 +2860,9 @@
                /* If its bigger than 4 bytes, the dir entry contains an 
offset. */
                value_ptr = offset_base+offset_val;
                if (offset_val+byte_count > IFDlength || value_ptr < dir_entry) 
{
-                       /*
-                       // It is important to check for IMAGE_FILETYPE_TIFF
-                       // JPEG does not use absolute pointers instead its 
pointers are relative to the start
-                       // of the TIFF header in APP1 section.
-                       */
+                       /* It is important to check for IMAGE_FILETYPE_TIFF
+                        * JPEG does not use absolute pointers instead its 
pointers are
+                        * relative to the start of the TIFF header in APP1 
section. */
                        if (offset_val+byte_count>ImageInfo->FileSize || 
(ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_II && 
ImageInfo->FileType!=IMAGE_FILETYPE_TIFF_MM && 
ImageInfo->FileType!=IMAGE_FILETYPE_JPEG)) {
                                if (value_ptr < dir_entry) {
                                        /* we can read this if offset_val > 0 */
@@ -2882,13 +2880,11 @@
                                value_ptr = safe_emalloc(byte_count, 1, 0);
                                outside = value_ptr;
                        } else {
-                               /*
-                               // in most cases we only access a small range so
-                               // it is faster to use a static buffer there
-                               // BUT it offers also the possibility to have
-                               // pointers read without the need to free them
-                               // explicitley before returning.
-                               */
+                               /* In most cases we only access a small range so
+                                * it is faster to use a static buffer there
+                                * BUT it offers also the possibility to have
+                                * pointers read without the need to free them
+                                * explicitley before returning. */
                                memset(&cbuf, 0, sizeof(cbuf));
                                value_ptr = cbuf;
                        }



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

Reply via email to