Skip to content

Commit

Permalink
Merge pull request #622 from drewnoakes/nikon-makernote-tags
Browse files Browse the repository at this point in the history 
Identify some unknown Nikon makernote tags
  • Loading branch information
@drewnoakes
drewnoakes authored Aug 21, 2023
2 parents 0672e46 + ccb8b2e commit 0fa0159
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
24 changes: 12 additions & 12 deletions Source/com/drew/metadata/exif/makernotes/NikonType2MakernoteDirectory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ public class NikonType2MakernoteDirectory extends Directory
public static final int TAG_COLOR_SPACE = 0x001e;
public static final int TAG_VR_INFO = 0x001f;
public static final int TAG_IMAGE_AUTHENTICATION = 0x0020;
public static final int TAG_UNKNOWN_35 = 0x0021;
public static final int TAG_FACE_DETECT = 0x0021;

/**
* The active D-Lighting setting.
Expand Down Expand Up @@ -386,7 +386,7 @@ public class NikonType2MakernoteDirectory extends Directory
* </ul>
*/
public static final int TAG_VIGNETTE_CONTROL = 0x002a;
public static final int TAG_UNKNOWN_40 = 0x002b;
public static final int TAG_DISTORT_INFO = 0x002b;
public static final int TAG_UNKNOWN_41 = 0x002c;
public static final int TAG_UNKNOWN_42 = 0x002d;
public static final int TAG_UNKNOWN_43 = 0x002e;
Expand Down Expand Up @@ -641,7 +641,7 @@ public class NikonType2MakernoteDirectory extends Directory
public static final int TAG_SENSOR_PIXEL_SIZE = 0x009A;
public static final int TAG_UNKNOWN_10 = 0x009B;
public static final int TAG_SCENE_ASSIST = 0x009C;
public static final int TAG_UNKNOWN_11 = 0x009D;
public static final int TAG_DATE_STAMP_MODE = 0x009D;
public static final int TAG_RETOUCH_HISTORY = 0x009E;
public static final int TAG_UNKNOWN_12 = 0x009F;

Expand Down Expand Up @@ -751,15 +751,15 @@ public class NikonType2MakernoteDirectory extends Directory
*/
public static final int TAG_HIGH_ISO_NOISE_REDUCTION = 0x00B1;
public static final int TAG_UNKNOWN_31 = 0x00B2;
public static final int TAG_UNKNOWN_32 = 0x00B3;
public static final int TAG_TONING_EFFECT = 0x00B3;
public static final int TAG_UNKNOWN_33 = 0x00B4;
public static final int TAG_UNKNOWN_48 = 0x00B5;
public static final int TAG_POWER_UP_TIME = 0x00B6;
public static final int TAG_AF_INFO_2 = 0x00B7;
public static final int TAG_FILE_INFO = 0x00B8;
public static final int TAG_AF_TUNE = 0x00B9;
public static final int TAG_UNKNOWN_49 = 0x00BB;
public static final int TAG_UNKNOWN_50 = 0x00BD;
public static final int TAG_RETOUCH_INFO = 0x00BB;
public static final int TAG_PICTURE_CONTROL_2 = 0x00BD;
public static final int TAG_UNKNOWN_51 = 0x0103;
public static final int TAG_PRINT_IMAGE_MATCHING_INFO = 0x0E00;

Expand Down Expand Up @@ -812,7 +812,7 @@ public class NikonType2MakernoteDirectory extends Directory
_tagNameMap.put(TAG_SENSOR_PIXEL_SIZE, "Sensor Pixel Size");
_tagNameMap.put(TAG_UNKNOWN_10, "Unknown 10");
_tagNameMap.put(TAG_SCENE_ASSIST, "Scene Assist");
_tagNameMap.put(TAG_UNKNOWN_11, "Unknown 11");
_tagNameMap.put(TAG_DATE_STAMP_MODE, "Date Stamp Mode");
_tagNameMap.put(TAG_RETOUCH_HISTORY, "Retouch History");
_tagNameMap.put(TAG_UNKNOWN_12, "Unknown 12");
_tagNameMap.put(TAG_FLASH_SYNC_MODE, "Flash Sync Mode");
Expand All @@ -833,7 +833,7 @@ public class NikonType2MakernoteDirectory extends Directory
_tagNameMap.put(TAG_COLOR_SPACE, "Color Space");
_tagNameMap.put(TAG_VR_INFO, "VR Info");
_tagNameMap.put(TAG_IMAGE_AUTHENTICATION, "Image Authentication");
_tagNameMap.put(TAG_UNKNOWN_35, "Unknown 35");
_tagNameMap.put(TAG_FACE_DETECT, "Face Detect");
_tagNameMap.put(TAG_ACTIVE_D_LIGHTING, "Active D-Lighting");
_tagNameMap.put(TAG_PICTURE_CONTROL, "Picture Control");
_tagNameMap.put(TAG_WORLD_TIME, "World Time");
Expand All @@ -843,7 +843,7 @@ public class NikonType2MakernoteDirectory extends Directory
_tagNameMap.put(TAG_UNKNOWN_38, "Unknown 38");
_tagNameMap.put(TAG_UNKNOWN_39, "Unknown 39");
_tagNameMap.put(TAG_VIGNETTE_CONTROL, "Vignette Control");
_tagNameMap.put(TAG_UNKNOWN_40, "Unknown 40");
_tagNameMap.put(TAG_DISTORT_INFO, "Distort Info");
_tagNameMap.put(TAG_UNKNOWN_41, "Unknown 41");
_tagNameMap.put(TAG_UNKNOWN_42, "Unknown 42");
_tagNameMap.put(TAG_UNKNOWN_43, "Unknown 43");
Expand All @@ -868,7 +868,7 @@ public class NikonType2MakernoteDirectory extends Directory
_tagNameMap.put(TAG_MULTI_EXPOSURE, "Multi Exposure");
_tagNameMap.put(TAG_HIGH_ISO_NOISE_REDUCTION, "High ISO Noise Reduction");
_tagNameMap.put(TAG_UNKNOWN_31, "Unknown 31");
_tagNameMap.put(TAG_UNKNOWN_32, "Unknown 32");
_tagNameMap.put(TAG_TONING_EFFECT, "Toning Effect");
_tagNameMap.put(TAG_UNKNOWN_33, "Unknown 33");
_tagNameMap.put(TAG_UNKNOWN_48, "Unknown 48");
_tagNameMap.put(TAG_POWER_UP_TIME, "Power Up Time");
Expand All @@ -891,8 +891,8 @@ public class NikonType2MakernoteDirectory extends Directory
_tagNameMap.put(TAG_NOISE_REDUCTION, "Noise Reduction");
_tagNameMap.put(TAG_LINEARIZATION_TABLE, "Linearization Table");
_tagNameMap.put(TAG_NIKON_CAPTURE_DATA, "Nikon Capture Data");
_tagNameMap.put(TAG_UNKNOWN_49, "Unknown 49");
_tagNameMap.put(TAG_UNKNOWN_50, "Unknown 50");
_tagNameMap.put(TAG_RETOUCH_INFO, "Retouch Info");
_tagNameMap.put(TAG_PICTURE_CONTROL_2, "Picture Control 2");
_tagNameMap.put(TAG_UNKNOWN_51, "Unknown 51");
_tagNameMap.put(TAG_PRINT_IMAGE_MATCHING_INFO, "Print IM");
_tagNameMap.put(TAG_UNKNOWN_52, "Unknown 52");
Expand Down
2 changes: 1 addition & 1 deletion Source/com/drew/tools/ProcessAllImagesInFolderUtility.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ abstract static class FileHandlerBase implements FileHandler
"nef", "crw", "cr2", "orf", "arw", "raf", "srw", "x3f", "rw2", "rwl", "dcr", "pef",
"tif", "tiff", "psd", "dng",
"j2c", "jp2", "jpf", "jpm", "mj2",
"mp3", "wav",
"mp3", "wav", "m4a",
"3g2", "3gp", "m4v", "mov", "mp4", "m2v", "m2ts", "mts",
"pbm", "pnm", "pgm", "ppm",
"avi",
Expand Down

0 comments on commit 0fa0159

Please sign in to comment.