Skip to content

Commit 130c8b3

Browse files
committed
Merge branch 'main' into issue_628_fix
2 parents d438e1d + 7e76f45 commit 130c8b3

File tree

6 files changed

+8
-2
lines changed

6 files changed

+8
-2
lines changed

Source/com/drew/imaging/FileType.java

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ public enum FileType
4747
QuickTime("MOV", "QuickTime Movie", "video/quicktime", "mov", "qt"),
4848
Mp4("MP4", "MPEG-4 Part 14", "video/mp4", "mp4", "m4a", "m4p", "m4b", "m4r", "m4v"),
4949
Heif("HEIF", "High Efficiency Image File Format", "image/heif", "heif", "heic"),
50+
Avif("AVIF", "AV1 Image File Format", "image/avif", "avif"),
5051
Eps("EPS", "Encapsulated PostScript", "application/postscript", "eps", "epsf", "epsi"),
5152
Mp3("MP3", "MPEG Audio Layer III", "audio/mpeg", "mp3"),
5253

Source/com/drew/imaging/ImageMetadataReader.java

+1
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ public static Metadata readMetadata(@NotNull final InputStream inputStream, fina
180180
case Eps:
181181
return EpsMetadataReader.readMetadata(inputStream);
182182
case Heif:
183+
case Avif:
183184
return HeifMetadataReader.readMetadata(inputStream);
184185
case Unknown:
185186
throw new ImageProcessingException("File format could not be determined");

Source/com/drew/imaging/quicktime/QuickTimeTypeChecker.java

+3
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ public class QuickTimeTypeChecker implements TypeChecker
8080
_ftypMap.put("hevc", FileType.Heif);
8181
_ftypMap.put("hevx", FileType.Heif);
8282

83+
// AVIF
84+
_ftypMap.put("avif", FileType.Avif);
85+
8386
// CRX
8487
_ftypMap.put("crx ", FileType.Crx);
8588
}

Source/com/drew/tools/ProcessAllImagesInFolderUtility.java

+1
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ abstract static class FileHandlerBase implements FileHandler
182182
"ai",
183183
"arw",
184184
"avi",
185+
"avif",
185186
"bmp",
186187
"cam",
187188
"cr2",

wiki

Submodule wiki updated from f164f4f to 9b2c2db

wiki-images

0 commit comments

Comments
 (0)