]> granicus.if.org Git - php/commitdiff
MFH
authorJani Taskinen <jani@php.net>
Sun, 3 Aug 2008 12:11:13 +0000 (12:11 +0000)
committerJani Taskinen <jani@php.net>
Sun, 3 Aug 2008 12:11:13 +0000 (12:11 +0000)
ext/exif/exif.c

index b2d9811a9453311e7d3f4e847aea8dd2c613e18b..cba20b899c030f8a60cc7eaac0ddbb3d5d10c666 100644 (file)
@@ -2862,11 +2862,9 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
                /* 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 */
@@ -2884,13 +2882,11 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha
                                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;
                        }