SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität

Fix some unfriendly behavior in Favicon#create(Path)

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Andrew Steinborn 2018-12-13 19:44:59 -05:00
Ursprung 2d54a2c15b
Commit e979db7778
1 geänderte Dateien mit 6 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

8
api/src/main/java/com/velocitypowered/api/util/Favicon.java
Datei anzeigen

@ -73,7 +73,7 @@ public final class Favicon {
public static Favicon create(BufferedImage image) { public static Favicon create(BufferedImage image) {
Preconditions.checkNotNull(image, "image"); Preconditions.checkNotNull(image, "image");
Preconditions.checkArgument(image.getWidth() == 64 && image.getHeight() == 64, Preconditions.checkArgument(image.getWidth() == 64 && image.getHeight() == 64,
"Image is not 64x64(found %sx%s)", image.getWidth(), image.getHeight()); "Image is not 64x64 (found %sx%s)", image.getWidth(),image.getHeight());
ByteArrayOutputStream os = new ByteArrayOutputStream(); ByteArrayOutputStream os = new ByteArrayOutputStream();
try { try {
ImageIO.write(image, "PNG", os); ImageIO.write(image, "PNG", os);
@ -93,7 +93,11 @@ public final class Favicon {
*/ */
public static Favicon create(Path path) throws IOException { public static Favicon create(Path path) throws IOException {
try (InputStream stream = Files.newInputStream(path)) { try (InputStream stream = Files.newInputStream(path)) {
return create(ImageIO.read(stream)); BufferedImage image = ImageIO.read(stream);
if (image == null) {
throw new IOException("Unable to read the image.");
}
return create(image);
} }
} }
} }