Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fujifilm enhancements #619

Merged
merged 2 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public String getDescription(int tagType)
}

@Nullable
private String getMakernoteVersionDescription()
public String getMakernoteVersionDescription()
{
return getVersionBytesDescription(TAG_MAKERNOTE_VERSION, 2);
}
Expand Down Expand Up @@ -444,6 +444,11 @@ public String getFilmModeDescription()
case 0x400: return "F4/Velvia";
case 0x500: return "Pro Neg. Std";
case 0x501: return "Pro Neg. Hi";
case 0x600: return "Classic Chrome";
case 0x700: return "Eterna";
case 0x800: return "Classic Negative";
case 0x900: return "Bleach Bypass";
case 0xa00: return "Nostalgic Neg";
default:
return "Unknown (" + value + ")";
}
Expand All @@ -467,3 +472,4 @@ public String getDynamicRangeSettingDescription()
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public class FujifilmMakernoteDirectory extends Directory
public static final int TAG_FRAME_NUMBER = 0x8003;

public static final int TAG_PARALLAX = 0xb211;
public static final int TAG_IMAGE_NUMBER = 0x1438;

@NotNull
private static final HashMap<Integer, String> _tagNameMap = new HashMap<Integer, String>();
Expand Down Expand Up @@ -156,6 +157,7 @@ public class FujifilmMakernoteDirectory extends Directory
_tagNameMap.put(TAG_FRAME_NUMBER, "Frame Number");

_tagNameMap.put(TAG_PARALLAX, "Parallax");
_tagNameMap.put(TAG_IMAGE_NUMBER, "Image Number");
}

public FujifilmMakernoteDirectory()
Expand Down