Include libwebp binaries in the package; renamed classes

Author: albrechtf

src/main/java/net/sf/mcf2pdf/mcfelements/util/ImageUtil.java

@@ -42,8 +42,8 @@
 import com.drew.metadata.MetadataException;
 import com.drew.metadata.exif.ExifDirectoryBase;
 
-import net.sf.mcf2pdf.mcfelements.util.webp.Qt5Webp;
-import net.sf.mcf2pdf.mcfelements.util.webp.Qt5WebpLib;
+import net.sf.mcf2pdf.mcfelements.util.webp.Webp;
+import net.sf.mcf2pdf.mcfelements.util.webp.WebpLib;
 
 /**
  * Utility class for working with images in the context of the mcf2pdf project.
@@ -61,7 +61,7 @@ public final class ImageUtil {
 
 	public static final double SQRT_2 = Math.sqrt(2);
 
-	private static Qt5WebpLib qt5Library;
+	private static WebpLib qt5Library;
 
 	private ImageUtil() {
 	}
@@ -264,10 +264,10 @@ private static BufferedImage internalRead(File f) throws IOException {
 		// special treatment for webp files
 		if (f.getName().toLowerCase(Locale.US).endsWith(".webp")) {
 			if (qt5Library == null) {
-				qt5Library = Qt5Webp.loadLibrary();
+				qt5Library = Webp.loadLibrary();
 			}
 
-			return Qt5Webp.loadWebPImage(f, qt5Library);
+			return Webp.loadWebPImage(f, qt5Library);
 		}
 
 		return ImageIO.read(f);

…f2pdf/mcfelements/util/webp/Qt5Webp.java …/mcf2pdf/mcfelements/util/webp/Webp.javasrc/main/java/net/sf/mcf2pdf/mcfelements/util/webp/Qt5Webp.java renamed to src/main/java/net/sf/mcf2pdf/mcfelements/util/webp/Webp.java src/main/java/net/sf/mcf2pdf/mcfelements/util/webp/Qt5Webp.java renamed to src/main/java/net/sf/mcf2pdf/mcfelements/util/webp/Webp.java

@@ -4,7 +4,6 @@
 import java.awt.image.DataBufferByte;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 
 import org.apache.commons.io.IOUtils;
@@ -13,34 +12,34 @@
 import com.sun.jna.Platform;
 
 /**
- * Utility class to load the Qt5 dynamic library for the WebP file format from
- * the CEWE installation directory, and for convenient WebP image loading using
- * that library.
+ * Utility class to load the dynamic library for the WebP file format from the
+ * CEWE installation directory, and for convenient WebP image loading using that
+ * library.
  *
  * @author Florian Albrecht
  *
- * @see Qt5WebpLib
+ * @see WebpLib
  *
  */
-public final class Qt5Webp {
+public final class Webp {
 
-	private Qt5Webp() {
+	private Webp() {
 	}
 
 	/**
 	 * Loads the WebP library. Under Windows, the library must be named
 	 * <code>libwebp.dll</code>, under Linux and Mac OS X, a
-	 * <code>libqwebp.so</code> is expected. It must be on the program's
-	 * classpath.
+	 * <code>libwebp.so</code> is expected. For Windows and Linux, the shared
+	 * library is included in the mcf2pdf package.
 	 *
-	 * @return The loaded Qt5 WebP library, as a dynamic Java JNA proxy.
+	 * @return The loaded WebP library, as a dynamic Java JNA proxy.
 	 *
 	 * @throws IOException
 	 *             If the library cannot be found.
 	 */
-	public static Qt5WebpLib loadLibrary() throws IOException {
-		String libName = Platform.isWindows() ? "libwebp.dll" : "libqwebp.so";
-		return (Qt5WebpLib) Native.loadLibrary(libName, Qt5WebpLib.class);
+	public static WebpLib loadLibrary() throws IOException {
+		String libName = Platform.isWindows() ? "libwebp.dll" : "libwebp.so";
+		return (WebpLib) Native.loadLibrary(libName, WebpLib.class);
 	}
 
 	/**
@@ -56,7 +55,7 @@ public static Qt5WebpLib loadLibrary() throws IOException {
 	 * @throws IOException
 	 *             If the image could not be loaded.
 	 */
-	public static BufferedImage loadWebPImage(File webpImageFile, Qt5WebpLib library) throws IOException {
+	public static BufferedImage loadWebPImage(File webpImageFile, WebpLib library) throws IOException {
 		int[] aw = new int[1];
 		int[] ah = new int[1];
 

…df/mcfelements/util/webp/Qt5WebpLib.java …f2pdf/mcfelements/util/webp/WebpLib.javasrc/main/java/net/sf/mcf2pdf/mcfelements/util/webp/Qt5WebpLib.java renamed to src/main/java/net/sf/mcf2pdf/mcfelements/util/webp/WebpLib.java src/main/java/net/sf/mcf2pdf/mcfelements/util/webp/Qt5WebpLib.java renamed to src/main/java/net/sf/mcf2pdf/mcfelements/util/webp/WebpLib.java

@@ -5,13 +5,13 @@
 
 /**
  * JNA interface with all required methods to be dynamically linked and accessed
- * from the shared Qt5 library for WebP access. Derived from <a href=
+ * from the shared WebP library. Derived from <a href=
  * "https://code.woboq.org/qt5/qtimageformats/src/3rdparty/libwebp/src/webp/decode.h.html">https://code.woboq.org/qt5/qtimageformats/src/3rdparty/libwebp/src/webp/decode.h.html</a>
  *
  * @author Florian Albrecht
  *
  */
-public interface Qt5WebpLib extends Library {
+public interface WebpLib extends Library {
 
 	int WebPGetInfo(byte[] data, int data_size, int[] width, int[] height);