Skip to content

Commit

Permalink
Merge branch 'main' into issue_628_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
drewnoakes committed Feb 4, 2024
2 parents d438e1d + 7e76f45 commit 130c8b3
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 2 deletions.
1 change: 1 addition & 0 deletions Source/com/drew/imaging/FileType.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public enum FileType
QuickTime("MOV", "QuickTime Movie", "video/quicktime", "mov", "qt"),
Mp4("MP4", "MPEG-4 Part 14", "video/mp4", "mp4", "m4a", "m4p", "m4b", "m4r", "m4v"),
Heif("HEIF", "High Efficiency Image File Format", "image/heif", "heif", "heic"),
Avif("AVIF", "AV1 Image File Format", "image/avif", "avif"),
Eps("EPS", "Encapsulated PostScript", "application/postscript", "eps", "epsf", "epsi"),
Mp3("MP3", "MPEG Audio Layer III", "audio/mpeg", "mp3"),

Expand Down
1 change: 1 addition & 0 deletions Source/com/drew/imaging/ImageMetadataReader.java
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ public static Metadata readMetadata(@NotNull final InputStream inputStream, fina
case Eps:
return EpsMetadataReader.readMetadata(inputStream);
case Heif:
case Avif:
return HeifMetadataReader.readMetadata(inputStream);
case Unknown:
throw new ImageProcessingException("File format could not be determined");
Expand Down
3 changes: 3 additions & 0 deletions Source/com/drew/imaging/quicktime/QuickTimeTypeChecker.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ public class QuickTimeTypeChecker implements TypeChecker
_ftypMap.put("hevc", FileType.Heif);
_ftypMap.put("hevx", FileType.Heif);

// AVIF
_ftypMap.put("avif", FileType.Avif);

// CRX
_ftypMap.put("crx ", FileType.Crx);
}
Expand Down
1 change: 1 addition & 0 deletions Source/com/drew/tools/ProcessAllImagesInFolderUtility.java
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ abstract static class FileHandlerBase implements FileHandler
"ai",
"arw",
"avi",
"avif",
"bmp",
"cam",
"cr2",
Expand Down
2 changes: 1 addition & 1 deletion wiki
Submodule wiki updated from f164f4 to 9b2c2d
2 changes: 1 addition & 1 deletion wiki-images

0 comments on commit 130c8b3

Please sign in to comment.