com php-src: Remove this redundant entry for Canon: ext/exif/exif.c
| From: | Kalle Sommer Nielsen | Date: | Sat, 06 Aug 2016 10:18:12 +0000 |
| Subject: | com php-src: Remove this redundant entry for Canon: ext/exif/exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93646@lists.php.net to get a copy of this message | ||
Commit: b147ef2bec30cc848a7e350952f81ebbf6f118f7
Author: Kalle Sommer Nielsen <kalle@php.net> Sat, 6 Aug 2016 12:18:12 +0200
Parents: a402d0bdabde4120b7278323abc8ea046e30f5a2
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b147ef2bec30cc848a7e350952f81ebbf6f118f7
Log:
Remove this redundant entry for Canon
Changed paths:
M ext/exif/exif.c
Diff:
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index cd924ee..19ad59b 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -1190,7 +1190,6 @@ typedef struct {
static const maker_note_type maker_note_array[] = {
{ tag_table_VND_CANON, "Canon", NULL, NULL,
0, 0, MN_ORDER_INTEL, MN_OFFSET_GUESS},
-/* { tag_table_VND_CANON, "Canon", NULL, NULL,
0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},*/
{ tag_table_VND_CASIO, "CASIO", NULL, NULL,
0, 0, MN_ORDER_MOTOROLA, MN_OFFSET_NORMAL},
{ tag_table_VND_FUJI, "FUJIFILM", NULL,
"FUJIFILM\x0C\x00\x00\x00", 12, 12, MN_ORDER_INTEL, MN_OFFSET_MAKER},
{ tag_table_VND_NIKON, "NIKON", NULL,
"Nikon\x00\x01\x00", 8, 8, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},