Skip to content

Commit

Permalink
Changed and added available Makernote tags
Browse files Browse the repository at this point in the history
  • Loading branch information
@gomfunkel
gomfunkel committed May 24, 2013
1 parent 54506a3 commit 90bc22b
Show file tree
Hide file tree
Showing 3 changed files with 354 additions and 132 deletions.
162 changes: 118 additions & 44 deletions lib/exif/makernotes/agfa.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,126 @@ exports.extractMakernotes = function (data, makernoteOffset, tiffOffset) {
var makernoteData = [];

// List of vendor specific Makernote tags found on
// http://www.ozhiker.com/electronics/pjmt/jpeg_info/makernotes.html
// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Olympus.html
var tags = {

0x0000 : 'Makernote Version',
0x0001 : 'Camera Settings',
0x0003 : 'Camera Settings',
0x0040 : 'Compressed Image Size',
0x0081 : 'Minolta Thumbnail Offset',
0x0088 : 'Minolta Thumbnail Offset',
0x0089 : 'Minolta Thumbnail Length',
0x0101 : 'Colour Mode',
0x0102 : 'Image Quality',
0x0103 : 'Image Quality',
0x0200 : 'Special Mode',
0x0201 : 'JPEG Quality',
0x0202 : 'Macro',
0x0204 : 'Digital Zoom',
0x0207 : 'Firmware Version',
0x0208 : 'Picture Info Data',
0x0209 : 'Camera ID',
0x020B : 'Image Width',
0x020C : 'Image Height',
0x020D : 'Original Manufacturer Model',
0x0E00 : 'Print Image Matching Info PIM',
0x1004 : 'Flash Mode',
0x1006 : 'Bracket',
0x100B : 'Focus Mode',
0x100C : 'Focus Distance',
0x100D : 'Zoom Numeric',
0x100E : 'Macro Focus',
0x100F : 'Sharpness Numeric',
0x1011 : 'Colour Matrix',
0x1012 : 'Black Level',
0x1015 : 'White Balance',
0x1017 : 'Red Bias',
0x1018 : 'Blue Bias',
0x101A : 'Serial Number',
0x1023 : 'Flash Bias',
0x1029 : 'Contrast',
0x102A : 'Sharpness Factor',
0x102B : 'Colour Control',
0x102C : 'Valid Bits',
0x102D : 'Coring Filter',
0x102E : 'Final Width',
0x102F : 'Final Height',
0x1034 : 'Compression Ratio'
0x0000 : "MakerNoteVersion",
0x0001 : "MinoltaCameraSettingsOld",
0x0003 : "MinoltaCameraSettings",
0x0040 : "CompressedImageSize",
0x0081 : "PreviewImageData",
0x0088 : "PreviewImageStart",
0x0089 : "PreviewImageLength",
0x0100 : "ThumbnailImage",
0x0104 : "BodyFirmwareVersion",
0x0200 : "SpecialMode",
0x0201 : "Quality",
0x0202 : "Macro",
0x0203 : "BWMode",
0x0204 : "DigitalZoom",
0x0205 : "FocalPlaneDiagonal",
0x0206 : "LensDistortionParams",
0x0207 : "CameraType",
0x0208 : "TextInfo",
0x0209 : "CameraID",
0x020B : "EpsonImageWidth",
0x020C : "EpsonImageHeight",
0x020D : "EpsonSoftware",
0x0280 : "PreviewImage",
0x0300 : "PreCaptureFrames",
0x0301 : "WhiteBoard",
0x0302 : "OneTouchWB",
0x0303 : "WhiteBalanceBracket",
0x0304 : "WhiteBalanceBias",
0x0403 : "SceneMode",
0x0404 : "SerialNumber",
0x0405 : "Firmware",
0x0E00 : "PrintIM",
0x0F00 : "DataDump",
0x0F01 : "DataDump2",
0x0F04 : "ZoomedPreviewStart",
0x0F05 : "ZoomedPreviewLength",
0x0F06 : "ZoomedPreviewSize",
0x1000 : "ShutterSpeedValue",
0x1001 : "ISOValue",
0x1002 : "ApertureValue",
0x1003 : "BrightnessValue",
0x1004 : "FlashMode",
0x1005 : "FlashDevice",
0x1006 : "ExposureCompensation",
0x1007 : "SensorTemperature",
0x1008 : "LensTemperature",
0x1009 : "LightCondition",
0x100A : "FocusRange",
0x100B : "FocusMode",
0x100C : "ManualFocusDistance",
0x100D : "ZoomStepCount",
0x100E : "FocusStepCount",
0x100F : "Sharpness",
0x1010 : "FlashChargeLevel",
0x1011 : "ColorMatrix",
0x1012 : "BlackLevel",
0x1013 : "ColorTemperatureBG?",
0x1014 : "ColorTemperatureRG?",
0x1015 : "WBMode",
0x1017 : "RedBalance",
0x1018 : "BlueBalance",
0x1019 : "ColorMatrixNumber",
0x101A : "SerialNumber",
0x101B : "ExternalFlashAE1_0?",
0x101C : "ExternalFlashAE2_0?",
0x101D : "InternalFlashAE1_0?",
0x101E : "InternalFlashAE2_0?",
0x101F : "ExternalFlashAE1?",
0x1020 : "ExternalFlashAE2?",
0x1021 : "InternalFlashAE1?",
0x1022 : "InternalFlashAE2?",
0x1023 : "FlashExposureComp",
0x1024 : "InternalFlashTable",
0x1025 : "ExternalFlashGValue",
0x1026 : "ExternalFlashBounce",
0x1027 : "ExternalFlashZoom",
0x1028 : "ExternalFlashMode",
0x1029 : "Contrast",
0x102A : "SharpnessFactor",
0x102B : "ColorControl",
0x102C : "ValidBits",
0x102D : "CoringFilter",
0x102E : "OlympusImageWidth",
0x102F : "OlympusImageHeight",
0x1030 : "SceneDetect",
0x1031 : "SceneArea?",
0x1033 : "SceneDetectData?",
0x1034 : "CompressionRatio",
0x1035 : "PreviewImageValid",
0x1036 : "PreviewImageStart",
0x1037 : "PreviewImageLength",
0x1038 : "AFResult",
0x1039 : "CCDScanMode",
0x103A : "NoiseReduction",
0x103B : "FocusStepInfinity",
0x103C : "FocusStepNear",
0x103D : "LightValueCenter",
0x103E : "LightValuePeriphery",
0x103F : "FieldCount?",
0x2010 : "Equipment",
0x2020 : "CameraSettings",
0x2030 : "RawDevelopment",
0x2031 : "RawDev2",
0x2040 : "ImageProcessing",
0x2050 : "FocusInfo",
0x2100 : "Olympus2100",
0x2200 : "Olympus2200",
0x2300 : "Olympus2300",
0x2400 : "Olympus2400",
0x2500 : "Olympus2500",
0x2600 : "Olympus2600",
0x2700 : "Olympus2700",
0x2800 : "Olympus2800",
0x2900 : "Olympus2900",
0x3000 : "RawInfo",
0x4000 : "MainInfo",
0x5000 : "UnknownInfo"

};

Expand Down
162 changes: 118 additions & 44 deletions lib/exif/makernotes/epson.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,52 +6,126 @@ exports.extractMakernotes = function (data, makernoteOffset, tiffOffset) {
var makernoteData = [];

// List of vendor specific Makernote tags found on
// http://www.ozhiker.com/electronics/pjmt/jpeg_info/makernotes.html
// http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/Olympus.html
var tags = {

0x0000 : 'Makernote Version',
0x0001 : 'Camera Settings',
0x0003 : 'Camera Settings',
0x0040 : 'Compressed Image Size',
0x0081 : 'Minolta Thumbnail Offset',
0x0088 : 'Minolta Thumbnail Offset',
0x0089 : 'Minolta Thumbnail Length',
0x0101 : 'Colour Mode',
0x0102 : 'Image Quality',
0x0103 : 'Image Quality',
0x0200 : 'Special Mode',
0x0201 : 'JPEG Quality',
0x0202 : 'Macro',
0x0204 : 'Digital Zoom',
0x0207 : 'Firmware Version',
0x0208 : 'Picture Info Data',
0x0209 : 'Camera ID',
0x020B : 'Image Width',
0x020C : 'Image Height',
0x020D : 'Original Manufacturer Model',
0x0E00 : 'Print Image Matching Info PIM',
0x1004 : 'Flash Mode',
0x1006 : 'Bracket',
0x100B : 'Focus Mode',
0x100C : 'Focus Distance',
0x100D : 'Zoom Numeric',
0x100E : 'Macro Focus',
0x100F : 'Sharpness Numeric',
0x1011 : 'Colour Matrix',
0x1012 : 'Black Level',
0x1015 : 'White Balance',
0x1017 : 'Red Bias',
0x1018 : 'Blue Bias',
0x101A : 'Serial Number',
0x1023 : 'Flash Bias',
0x1029 : 'Contrast',
0x102A : 'Sharpness Factor',
0x102B : 'Colour Control',
0x102C : 'Valid Bits',
0x102D : 'Coring Filter',
0x102E : 'Final Width',
0x102F : 'Final Height',
0x1034 : 'Compression Ratio'
0x0000 : "MakerNoteVersion",
0x0001 : "MinoltaCameraSettingsOld",
0x0003 : "MinoltaCameraSettings",
0x0040 : "CompressedImageSize",
0x0081 : "PreviewImageData",
0x0088 : "PreviewImageStart",
0x0089 : "PreviewImageLength",
0x0100 : "ThumbnailImage",
0x0104 : "BodyFirmwareVersion",
0x0200 : "SpecialMode",
0x0201 : "Quality",
0x0202 : "Macro",
0x0203 : "BWMode",
0x0204 : "DigitalZoom",
0x0205 : "FocalPlaneDiagonal",
0x0206 : "LensDistortionParams",
0x0207 : "CameraType",
0x0208 : "TextInfo",
0x0209 : "CameraID",
0x020B : "EpsonImageWidth",
0x020C : "EpsonImageHeight",
0x020D : "EpsonSoftware",
0x0280 : "PreviewImage",
0x0300 : "PreCaptureFrames",
0x0301 : "WhiteBoard",
0x0302 : "OneTouchWB",
0x0303 : "WhiteBalanceBracket",
0x0304 : "WhiteBalanceBias",
0x0403 : "SceneMode",
0x0404 : "SerialNumber",
0x0405 : "Firmware",
0x0E00 : "PrintIM",
0x0F00 : "DataDump",
0x0F01 : "DataDump2",
0x0F04 : "ZoomedPreviewStart",
0x0F05 : "ZoomedPreviewLength",
0x0F06 : "ZoomedPreviewSize",
0x1000 : "ShutterSpeedValue",
0x1001 : "ISOValue",
0x1002 : "ApertureValue",
0x1003 : "BrightnessValue",
0x1004 : "FlashMode",
0x1005 : "FlashDevice",
0x1006 : "ExposureCompensation",
0x1007 : "SensorTemperature",
0x1008 : "LensTemperature",
0x1009 : "LightCondition",
0x100A : "FocusRange",
0x100B : "FocusMode",
0x100C : "ManualFocusDistance",
0x100D : "ZoomStepCount",
0x100E : "FocusStepCount",
0x100F : "Sharpness",
0x1010 : "FlashChargeLevel",
0x1011 : "ColorMatrix",
0x1012 : "BlackLevel",
0x1013 : "ColorTemperatureBG?",
0x1014 : "ColorTemperatureRG?",
0x1015 : "WBMode",
0x1017 : "RedBalance",
0x1018 : "BlueBalance",
0x1019 : "ColorMatrixNumber",
0x101A : "SerialNumber",
0x101B : "ExternalFlashAE1_0?",
0x101C : "ExternalFlashAE2_0?",
0x101D : "InternalFlashAE1_0?",
0x101E : "InternalFlashAE2_0?",
0x101F : "ExternalFlashAE1?",
0x1020 : "ExternalFlashAE2?",
0x1021 : "InternalFlashAE1?",
0x1022 : "InternalFlashAE2?",
0x1023 : "FlashExposureComp",
0x1024 : "InternalFlashTable",
0x1025 : "ExternalFlashGValue",
0x1026 : "ExternalFlashBounce",
0x1027 : "ExternalFlashZoom",
0x1028 : "ExternalFlashMode",
0x1029 : "Contrast",
0x102A : "SharpnessFactor",
0x102B : "ColorControl",
0x102C : "ValidBits",
0x102D : "CoringFilter",
0x102E : "OlympusImageWidth",
0x102F : "OlympusImageHeight",
0x1030 : "SceneDetect",
0x1031 : "SceneArea?",
0x1033 : "SceneDetectData?",
0x1034 : "CompressionRatio",
0x1035 : "PreviewImageValid",
0x1036 : "PreviewImageStart",
0x1037 : "PreviewImageLength",
0x1038 : "AFResult",
0x1039 : "CCDScanMode",
0x103A : "NoiseReduction",
0x103B : "FocusStepInfinity",
0x103C : "FocusStepNear",
0x103D : "LightValueCenter",
0x103E : "LightValuePeriphery",
0x103F : "FieldCount?",
0x2010 : "Equipment",
0x2020 : "CameraSettings",
0x2030 : "RawDevelopment",
0x2031 : "RawDev2",
0x2040 : "ImageProcessing",
0x2050 : "FocusInfo",
0x2100 : "Olympus2100",
0x2200 : "Olympus2200",
0x2300 : "Olympus2300",
0x2400 : "Olympus2400",
0x2500 : "Olympus2500",
0x2600 : "Olympus2600",
0x2700 : "Olympus2700",
0x2800 : "Olympus2800",
0x2900 : "Olympus2900",
0x3000 : "RawInfo",
0x4000 : "MainInfo",
0x5000 : "UnknownInfo"

};

Expand Down
Loading

0 comments on commit 90bc22b

Please sign in to comment.