com php-src: Added support for Sigma/Foveon EXIF tags: ext/exif/exif.c
| From: | Kalle Sommer Nielsen | Date: | Sat, 06 Aug 2016 10:37:10 +0000 |
| Subject: | com php-src: Added support for Sigma/Foveon EXIF tags: ext/exif/exif.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93649@lists.php.net to get a copy of this message | ||
Commit: 8fd640f957f1ed6974272f3bedd32235ac204df1
Author: Kalle Sommer Nielsen <kalle@php.net> Sat, 6 Aug 2016 12:37:10 +0200
Parents: 57faafeb89a915f7215a1b4632986658b4adea00
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8fd640f957f1ed6974272f3bedd32235ac204df1
Log:
Added support for Sigma/Foveon EXIF tags
Note, the tag_info_array is re-used for both SIGMA and FOVEON, as their IFD headers can differ
Changed paths:
M ext/exif/exif.c
Diff:
diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 0ba0c51..95e49b4 100644
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -1282,6 +1282,33 @@ static tag_info_array tag_table_VND_MINOLTA = {
TAG_TABLE_END
};
+static tag_info_array tag_table_VND_SIGMA = {
+ { 0x0002, "SerialNumber"},
+ { 0x0003, "DriveMode"},
+ { 0x0004, "ResolutionMode"},
+ { 0x0005, "AutofocusMode"},
+ { 0x0006, "FocusSetting"},
+ { 0x0007, "WhiteBalance"},
+ { 0x0008, "ExposureMode"},
+ { 0x0009, "MeteringMode"},
+ { 0x000a, "LensRange"},
+ { 0x000b, "ColorSpace"},
+ { 0x000c, "Exposure"},
+ { 0x000d, "Contrast"},
+ { 0x000e, "Shadow"},
+ { 0x000f, "Highlight"},
+ { 0x0010, "Saturation"},
+ { 0x0011, "Sharpness"},
+ { 0x0012, "FillLight"},
+ { 0x0014, "ColorAdjustment"},
+ { 0x0015, "AdjustmentMode"},
+ { 0x0016, "Quality"},
+ { 0x0017, "Firmware"},
+ { 0x0018, "Software"},
+ { 0x0019, "AutoBracket"},
+ TAG_TABLE_END
+};
+
typedef enum mn_byte_order_t {
MN_ORDER_INTEL = 0,
MN_ORDER_MOTOROLA = 1,
@@ -1317,7 +1344,9 @@ static const maker_note_type maker_note_array[] = {
{ tag_table_VND_DJI, "DJI", NULL, NULL,
0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
{ tag_table_VND_SONY, "SONY", NULL, "SONY DSC
\x00\x00\x00", 12, 12, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
{ tag_table_VND_PENTAX, "PENTAX", NULL, "AOC\x00",
6, 6, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
- { tag_table_VND_MINOLTA, "Minolta, KONICA MINOLTA", NULL, NULL,
0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}
+ { tag_table_VND_MINOLTA, "Minolta, KONICA MINOLTA", NULL, NULL,
0, 0, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
+ { tag_table_VND_SIGMA, "SIGMA, FOVEON", NULL,
"SIGMA\x00\x00\x00", 10, 10, MN_ORDER_NORMAL, MN_OFFSET_NORMAL},
+ { tag_table_VND_SIGMA, "SIGMA, FOVEON", NULL,
"FOVEON\x00\x00\x00", 10, 10, MN_ORDER_NORMAL, MN_OFFSET_NORMAL}
};
/* }}} */