Added support for PENTAX EXIF tags

diff --git a/ext/exif/exif.c b/ext/exif/exif.c
index 19ad59bbaa1dba95131c4810075553ff764151d9..50c3ae9599dd081b04ab7faf54d155422fe2e4ba 100644 (file)
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@@ -1165,6 +1165,91 @@ static tag_info_array tag_table_VND_SONY = {
   TAG_TABLE_END
 };
 
+static tag_info_array tag_table_VND_PENTAX = {
+         { 0x0000, "Version"},
+  { 0x0001, "Mode"},
+  { 0x0002, "PreviewResolution"},
+  { 0x0003, "PreviewLength"},
+  { 0x0004, "PreviewOffset"},
+  { 0x0005, "ModelID"},
+  { 0x0006, "Date"},
+  { 0x0007, "Time"},
+  { 0x0008, "Quality"},
+  { 0x0009, "Size"},
+  { 0x000c, "Flash"},
+  { 0x000d, "Focus"},
+  { 0x000e, "AFPoint"},
+  { 0x000f, "AFPointInFocus"},
+  { 0x0012, "ExposureTime"},
+  { 0x0013, "FNumber"},
+  { 0x0014, "ISO"},
+  { 0x0016, "ExposureCompensation"},
+  { 0x0017, "MeteringMode"},
+  { 0x0018, "AutoBracketing"},
+  { 0x0019, "WhiteBalance"},
+  { 0x001a, "WhiteBalanceMode"},
+  { 0x001b, "BlueBalance"},
+  { 0x001c, "RedBalance"},
+  { 0x001d, "FocalLength"},
+  { 0x001e, "DigitalZoom"},
+  { 0x001f, "Saturation"},
+  { 0x0020, "Contrast"},
+  { 0x0021, "Sharpness"},
+  { 0x0022, "Location"},
+  { 0x0023, "Hometown"},
+  { 0x0024, "Destination"},
+  { 0x0025, "HometownDST"},
+  { 0x0026, "DestinationDST"},
+  { 0x0027, "DSPFirmwareVersion"},
+  { 0x0028, "CPUFirmwareVersion"},
+  { 0x0029, "FrameNumber"},
+  { 0x002d, "EffectiveLV"},
+  { 0x0032, "ImageProcessing"},
+  { 0x0033, "PictureMode"},
+  { 0x0034, "DriveMode"},
+  { 0x0037, "ColorSpace"},
+  { 0x0038, "ImageAreaOffset"},
+  { 0x0039, "RawImageSize"},
+  { 0x003e, "PreviewImageBorders"},
+  { 0x003f, "LensType"},
+  { 0x0040, "SensitivityAdjust"},
+  { 0x0041, "DigitalFilter"},
+  { 0x0047, "Temperature"},
+  { 0x0048, "AELock"},
+  { 0x0049, "NoiseReduction"},
+  { 0x004d, "FlashExposureCompensation"},
+  { 0x004f, "ImageTone"},
+  { 0x0050, "ColorTemperature"},
+  { 0x005c, "ShakeReduction"},
+  { 0x005d, "ShutterCount"},
+  { 0x0069, "DynamicRangeExpansion"},
+  { 0x0071, "HighISONoiseReduction"},
+  { 0x0072, "AFAdjustment"},
+  { 0x0200, "BlackPoint"},
+  { 0x0201, "WhitePoint"},
+  { 0x0205, "ShotInfo"},
+  { 0x0206, "AEInfo"},
+  { 0x0207, "LensInfo"},
+  { 0x0208, "FlashInfo"},
+  { 0x0209, "AEMeteringSegments"},
+  { 0x020a, "FlashADump"},
+  { 0x020b, "FlashBDump"},
+  { 0x020d, "WB_RGGBLevelsDaylight"},
+  { 0x020e, "WB_RGGBLevelsShade"},
+  { 0x020f, "WB_RGGBLevelsCloudy"},
+  { 0x0210, "WB_RGGBLevelsTungsten"},
+  { 0x0211, "WB_RGGBLevelsFluorescentD"},
+  { 0x0212, "WB_RGGBLevelsFluorescentN"},
+  { 0x0213, "WB_RGGBLevelsFluorescentW"},
+  { 0x0214, "WB_RGGBLevelsFlash"},
+  { 0x0215, "CameraInfo"},
+  { 0x0216, "BatteryInfo"},
+  { 0x021f, "AFInfo"},
+  { 0x0222, "ColorInfo"},
+  { 0x0229, "SerialNumber"},
+  TAG_TABLE_END
+};
+
 typedef enum mn_byte_order_t {
        MN_ORDER_INTEL    = 0,
        MN_ORDER_MOTOROLA = 1,
@@ -1198,7 +1283,8 @@ static const maker_note_type maker_note_array[] = {
   { tag_table_VND_SAMSUNG,   "SAMSUNG",                 NULL, NULL,                        0,  0,  MN_ORDER_NORMAL,   MN_OFFSET_NORMAL}, 
   { tag_table_VND_PANASONIC, "Panasonic",               NULL, "Panasonic\x00\x00\x00",     12, 12, MN_ORDER_NORMAL,   MN_OFFSET_NORMAL}, 
   { 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_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}
 };
 /* }}} */