diff --git a/scrimage-webp/src/main/java/com/sksamuel/scrimage/webp/WebpHandler.java b/scrimage-webp/src/main/java/com/sksamuel/scrimage/webp/WebpHandler.java index d0a16a8b..73ab9661 100644 --- a/scrimage-webp/src/main/java/com/sksamuel/scrimage/webp/WebpHandler.java +++ b/scrimage-webp/src/main/java/com/sksamuel/scrimage/webp/WebpHandler.java @@ -37,17 +37,17 @@ protected static Path createPlaceholder(String name) throws IOException { } protected static void installBinary(Path output, String... sources) throws IOException { - logger.info("Installing binary at " + output); + logger.info("Installing binary at {}", output); for (String source : sources) { - logger.debug("Trying source from " + source); + logger.debug("Trying source from {}", source); InputStream in = WebpHandler.class.getResourceAsStream(source); if (in != null) { - logger.debug("Source detected " + source); + logger.debug("Source detected {}", source); Files.copy(in, output, StandardCopyOption.REPLACE_EXISTING); in.close(); if (!SystemUtils.IS_OS_WINDOWS) { - logger.info("Setting executable " + output); + logger.info("Setting executable {}", output); setExecutable(output); } return; @@ -83,7 +83,7 @@ private static String[] macIntel(String binaryName) { return new String[]{ "/webp_binaries/" + binaryName, "/webp_binaries/mac/" + binaryName, - "/dist_webp_binaries/libwebp-1.3.2-mac-x86-64/bin/" + binaryName, + "/dist_webp_binaries/libwebp-1.4.0-mac-x86-64/bin/" + binaryName, }; } @@ -91,7 +91,7 @@ private static String[] macArm(String binaryName) { return new String[]{ "/webp_binaries/" + binaryName, "/webp_binaries/mac_arm64/" + binaryName, - "/dist_webp_binaries/libwebp-1.3.2-mac-arm64/bin/" + binaryName, + "/dist_webp_binaries/libwebp-1.4.0-mac-arm64/bin/" + binaryName, }; } @@ -104,8 +104,8 @@ private static String[] windows(String binaryName) { "/webp_binaries/window/" + binaryName + ".exe", "/webp_binaries/windows/" + binaryName, "/webp_binaries/windows/" + binaryName + ".exe", - "/dist_webp_binaries/libwebp-1.3.2-windows-x64/bin/" + binaryName, - "/dist_webp_binaries/libwebp-1.3.2-windows-x64/bin/" + binaryName + ".exe", + "/dist_webp_binaries/libwebp-1.4.0-windows-x64/bin/" + binaryName, + "/dist_webp_binaries/libwebp-1.4.0-windows-x64/bin/" + binaryName + ".exe", }; } @@ -113,7 +113,7 @@ private static String[] linux(String binaryName) { return new String[]{ "/webp_binaries/" + binaryName, "/webp_binaries/linux/" + binaryName, - "/dist_webp_binaries/libwebp-1.3.2-linux-x86-64/bin/" + binaryName, + "/dist_webp_binaries/libwebp-1.4.0-linux-x86-64/bin/" + binaryName, }; } @@ -121,7 +121,7 @@ private static String[] linuxArm(String binaryName) { return new String[]{ "/webp_binaries/" + binaryName, "/webp_binaries/linux/" + binaryName, - "/dist_webp_binaries/libwebp-1.3.2-linux-aarch64/bin/" + binaryName, + "/dist_webp_binaries/libwebp-1.4.0-linux-aarch64/bin/" + binaryName, }; } diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-x86-64/bin/dwebp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-x86-64/bin/dwebp deleted file mode 100755 index 43a6a305..00000000 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-x86-64/bin/dwebp and /dev/null differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-x86-64/bin/gif2webp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-x86-64/bin/gif2webp deleted file mode 100755 index a559615c..00000000 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-x86-64/bin/gif2webp and /dev/null differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-arm64/bin/dwebp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-arm64/bin/dwebp deleted file mode 100755 index ecb4abfe..00000000 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-arm64/bin/dwebp and /dev/null differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-arm64/bin/gif2webp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-arm64/bin/gif2webp deleted file mode 100755 index fce96063..00000000 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-arm64/bin/gif2webp and /dev/null differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-x86-64/bin/dwebp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-x86-64/bin/dwebp deleted file mode 100755 index 608604af..00000000 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-x86-64/bin/dwebp and /dev/null differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-x86-64/bin/gif2webp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-x86-64/bin/gif2webp deleted file mode 100755 index 5b86a728..00000000 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-x86-64/bin/gif2webp and /dev/null differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-windows-x64/bin/cwebp.exe b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-windows-x64/bin/cwebp.exe deleted file mode 100644 index 7a33eb28..00000000 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-windows-x64/bin/cwebp.exe and /dev/null differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-windows-x64/bin/dwebp.exe b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-windows-x64/bin/dwebp.exe deleted file mode 100644 index ccc8fe19..00000000 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-windows-x64/bin/dwebp.exe and /dev/null differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-aarch64/bin/cwebp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-aarch64/bin/cwebp similarity index 70% rename from scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-aarch64/bin/cwebp rename to scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-aarch64/bin/cwebp index b17b3471..7d402921 100755 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-aarch64/bin/cwebp and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-aarch64/bin/cwebp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-aarch64/bin/dwebp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-aarch64/bin/dwebp similarity index 59% rename from scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-aarch64/bin/dwebp rename to scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-aarch64/bin/dwebp index b72360b5..3aa17675 100755 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-aarch64/bin/dwebp and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-aarch64/bin/dwebp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-aarch64/bin/gif2webp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-aarch64/bin/gif2webp similarity index 58% rename from scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-aarch64/bin/gif2webp rename to scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-aarch64/bin/gif2webp index b280dd8b..bfb90ac8 100755 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-aarch64/bin/gif2webp and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-aarch64/bin/gif2webp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-x86-64/bin/cwebp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-x86-64/bin/cwebp similarity index 50% rename from scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-x86-64/bin/cwebp rename to scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-x86-64/bin/cwebp index 3a0581c5..d6a02e02 100755 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-linux-x86-64/bin/cwebp and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-x86-64/bin/cwebp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-x86-64/bin/dwebp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-x86-64/bin/dwebp new file mode 100755 index 00000000..4669b718 Binary files /dev/null and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-x86-64/bin/dwebp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-x86-64/bin/gif2webp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-x86-64/bin/gif2webp new file mode 100755 index 00000000..a7855cbe Binary files /dev/null and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-linux-x86-64/bin/gif2webp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-arm64/bin/cwebp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-arm64/bin/cwebp similarity index 66% rename from scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-arm64/bin/cwebp rename to scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-arm64/bin/cwebp index e2555e47..2c1bfd7d 100755 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-arm64/bin/cwebp and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-arm64/bin/cwebp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-arm64/bin/dwebp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-arm64/bin/dwebp new file mode 100755 index 00000000..b6e65c82 Binary files /dev/null and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-arm64/bin/dwebp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-arm64/bin/gif2webp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-arm64/bin/gif2webp new file mode 100755 index 00000000..7b51e62c Binary files /dev/null and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-arm64/bin/gif2webp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-x86-64/bin/cwebp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-x86-64/bin/cwebp similarity index 62% rename from scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-x86-64/bin/cwebp rename to scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-x86-64/bin/cwebp index 9608eebd..18d97991 100755 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-mac-x86-64/bin/cwebp and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-x86-64/bin/cwebp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-x86-64/bin/dwebp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-x86-64/bin/dwebp new file mode 100755 index 00000000..ec8f915c Binary files /dev/null and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-x86-64/bin/dwebp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-x86-64/bin/gif2webp b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-x86-64/bin/gif2webp new file mode 100755 index 00000000..04be41da Binary files /dev/null and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-mac-x86-64/bin/gif2webp differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-windows-x64/bin/cwebp.exe b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-windows-x64/bin/cwebp.exe new file mode 100644 index 00000000..d49c8087 Binary files /dev/null and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-windows-x64/bin/cwebp.exe differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-windows-x64/bin/dwebp.exe b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-windows-x64/bin/dwebp.exe new file mode 100644 index 00000000..8bd09296 Binary files /dev/null and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-windows-x64/bin/dwebp.exe differ diff --git a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-windows-x64/bin/gif2webp.exe b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-windows-x64/bin/gif2webp.exe similarity index 55% rename from scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-windows-x64/bin/gif2webp.exe rename to scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-windows-x64/bin/gif2webp.exe index f01b6743..1a8dd89b 100644 Binary files a/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.3.2-windows-x64/bin/gif2webp.exe and b/scrimage-webp/src/main/resources/dist_webp_binaries/libwebp-1.4.0-windows-x64/bin/gif2webp.exe differ