iliaa                                    Tue, 12 Apr 2011 18:33:08 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=310167

Log:
Fixed bug #54121 (error message format string typo).

Bug: http://bugs.php.net/54121 (Open) php: exif error message format string typo
      
Changed paths:
    U   php/php-src/branches/PHP_5_3/NEWS
    U   php/php-src/branches/PHP_5_3/ext/exif/exif.c
    U   php/php-src/trunk/ext/exif/exif.c

Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS   2011-04-12 17:30:42 UTC (rev 310166)
+++ php/php-src/branches/PHP_5_3/NEWS   2011-04-12 18:33:08 UTC (rev 310167)
@@ -34,6 +34,9 @@
 - DBA extension:
   . Fixed bug #54242 (dba_insert returns true if key already exists). (Felipe)

+- Exif extesion:
+  . Fixed bug #54121 (error message format string typo). (Ilia)
+
 - Filter extension:
   . Fixed bug #53037 (FILTER_FLAG_EMPTY_STRING_NULL is not implemented). (Ilia)


Modified: php/php-src/branches/PHP_5_3/ext/exif/exif.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/exif/exif.c        2011-04-12 17:30:42 UTC 
(rev 310166)
+++ php/php-src/branches/PHP_5_3/ext/exif/exif.c        2011-04-12 18:33:08 UTC 
(rev 310167)
@@ -2909,7 +2909,7 @@
                        fgot = php_stream_tell(ImageInfo->infile);
                        if (fgot!=offset_val) {
                                EFREE_IF(outside);
-                               exif_error_docref(NULL EXIFERR_CC, ImageInfo, 
E_WARNING, "Wrong file pointer: 0x%08X != 0x08X", fgot, offset_val);
+                               exif_error_docref(NULL EXIFERR_CC, ImageInfo, 
E_WARNING, "Wrong file pointer: 0x%08X != 0x%08X", fgot, offset_val);
                                return FALSE;
                        }
                        fgot = php_stream_read(ImageInfo->infile, value_ptr, 
byte_count);

Modified: php/php-src/trunk/ext/exif/exif.c
===================================================================
--- php/php-src/trunk/ext/exif/exif.c   2011-04-12 17:30:42 UTC (rev 310166)
+++ php/php-src/trunk/ext/exif/exif.c   2011-04-12 18:33:08 UTC (rev 310167)
@@ -2905,7 +2905,7 @@
                        fgot = php_stream_tell(ImageInfo->infile);
                        if (fgot!=offset_val) {
                                EFREE_IF(outside);
-                               exif_error_docref(NULL EXIFERR_CC, ImageInfo, 
E_WARNING, "Wrong file pointer: 0x%08X != 0x08X", fgot, offset_val);
+                               exif_error_docref(NULL EXIFERR_CC, ImageInfo, 
E_WARNING, "Wrong file pointer: 0x%08X != 0x%08X", fgot, offset_val);
                                return FALSE;
                        }
                        fgot = php_stream_read(ImageInfo->infile, value_ptr, 
byte_count);

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

Reply via email to