* Make sure Loader.load() also initializes classes that are passed explicitly

Author: saudet

CHANGELOG.md

@@ -1,4 +1,5 @@
 
+ * Make sure `Loader.load()` also initializes classes that are passed explicitly
  * Fix `Loader.createLibraryLink()` incorrectly truncating library versions when there is one before and another after the suffix
  * Iterate extensions of libraries or executables on `Loader.load()` in reverse to be consistent with properties overriding
  * Allow prefixing library names with `:` to have `Loader` consider them as filenames with prefix and suffix already included

src/main/java/org/bytedeco/javacpp/Loader.java

@@ -948,7 +948,7 @@ public static String load() {
         return load(getCallerClass(2), loadProperties(), Loader.pathsFirst);
     }
     /**
-     * Loads native libraries associated with the {@link Class} of the caller.
+     * Loads native libraries associated with the {@link Class} of the caller and initializes it.
      *
      * @param pathsFirst search the paths first before bundled resources
      * @return {@code load(getCallerClass(2), loadProperties(), pathsFirst) }
@@ -964,9 +964,9 @@ public static String load(Class cls) {
         return load(cls, loadProperties(), Loader.pathsFirst);
     }
     /**
-     * Loads native libraries associated with the given {@link Class}.
+     * Loads native libraries associated with the given {@link Class} and initializes it.
      *
-     * @param cls the Class to get native library information from
+     * @param cls the Class to get native library information from and to initialize
      * @param properties the platform Properties to inherit
      * @param pathsFirst search the paths first before bundled resources
      * @return the full path to the main file loaded, or the library name if unknown
@@ -977,6 +977,8 @@ public static String load(Class cls) {
      * @see #loadLibrary(URL[], String)
      */
     public static String load(Class cls, Properties properties, boolean pathsFirst) {
+        Class classToLoad = cls;
+
         if (!isLoadLibraries() || cls == null) {
             return null;
         }
@@ -999,6 +1001,12 @@ public static String load(Class cls, Properties properties, boolean pathsFirst)
             }
             targets.add(cls.getName());
         }
+
+        // Make sure that we also initialize the class that was passed explicitly
+        if (!targets.contains(classToLoad.getName())) {
+            targets.add(classToLoad.getName());
+        }
+
         for (String s : targets) {
             try {
                 if (logger.isDebugEnabled()) {