* Append @NoException annotation to presets for libdc1394, libfree…

…nect, MKL, OpenBLAS, FFTW, GSL, Leptonica, CUDA, and system APIs to reduce unneeded C++ overhead
bytedeco · Feb 14, 2018 · 916b060 · 916b060
1 parent 78d9e78
commit 916b060
Show file tree

Hide file tree

Showing 39 changed files with 108 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Append `@NoException` annotation to presets for libdc1394, libfreenect, MKL, OpenBLAS, FFTW, GSL, Leptonica, CUDA, and system APIs to reduce unneeded C++ overhead
  * Fix mapping of `fftwf_iodim` and `fftwf_iodim64` for FFTW ([issue #523](https://github.com/bytedeco/javacpp-presets/issues/523))
  * Add support for iOS and Accelerate to presets for OpenBLAS ([pull #515](https://github.com/bytedeco/javacpp-presets/pull/515))
  * Add "org.bytedeco.javacpp.openblas.load" system property to use libraries from Accelerate, etc ([pull #444](https://github.com/bytedeco/javacpp-presets/pull/444))

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cublas.java b/cuda/src/main/java/org/bytedeco/javacpp/cublas.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cuda.java b/cuda/src/main/java/org/bytedeco/javacpp/cuda.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 
@@ -26325,7 +26325,7 @@ public static class __half2_raw extends Pointer {
     public __half(@Const @ByRef __half_raw hr) { super((Pointer)null); allocate(hr); }
     private native void allocate(@Const @ByRef __half_raw hr);
     public native @ByRef @Name("operator =") __half put(@Const @ByRef __half_raw hr);
-    public native @ByVal @Name("operator __half_raw") __half_raw as__half_raw();
+    public native @ByVal @Cast("__half_raw*") @Name("operator __half_raw") __half_raw as__half_raw();
 
 /* Member functions are only available to nvcc compilation */
 // #if defined(__CUDACC__)
@@ -26365,7 +26365,7 @@ public static class __half2_raw extends Pointer {
     public __half2(@Const @ByRef __half2_raw h2r ) { super((Pointer)null); allocate(h2r); }
     private native void allocate(@Const @ByRef __half2_raw h2r );
     public native @ByRef @Name("operator =") __half2 put(@Const @ByRef __half2_raw h2r);
-    public native @ByVal @Name("operator __half2_raw") __half2_raw as__half2_raw();
+    public native @ByVal @Cast("__half2_raw*") @Name("operator __half2_raw") __half2_raw as__half2_raw();
 }
 
 /* Restore -Weffc++ warnings from here on */

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cudnn.java b/cuda/src/main/java/org/bytedeco/javacpp/cudnn.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cufft.java b/cuda/src/main/java/org/bytedeco/javacpp/cufft.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cufftw.java b/cuda/src/main/java/org/bytedeco/javacpp/cufftw.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/curand.java b/cuda/src/main/java/org/bytedeco/javacpp/curand.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cusolver.java b/cuda/src/main/java/org/bytedeco/javacpp/cusolver.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/cusparse.java b/cuda/src/main/java/org/bytedeco/javacpp/cusparse.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/nppc.java b/cuda/src/main/java/org/bytedeco/javacpp/nppc.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/nppi.java b/cuda/src/main/java/org/bytedeco/javacpp/nppi.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/npps.java b/cuda/src/main/java/org/bytedeco/javacpp/npps.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/presets/cublas.java b/cuda/src/main/java/org/bytedeco/javacpp/presets/cublas.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -35,6 +36,7 @@
 @Properties(inherit = cuda.class, value = {
     @Platform(define = {"CUBLASAPI", "CUBLAS_V2_H_"}, include = {"<cublas_api.h>", "<cublas.h>", "<cublasXt.h>"}, link = "cublas@.9.1")},
         target = "org.bytedeco.javacpp.cublas")
+@NoException
 public class cublas implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("CUBLASAPI", "CUBLASWINAPI").cppTypes().annotations().cppText(""))

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/presets/cuda.java b/cuda/src/main/java/org/bytedeco/javacpp/presets/cuda.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -44,6 +45,7 @@
                                         preloadpath = "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.1/bin/",
                                            linkpath = "C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.1/lib/x64/") },
         target = "org.bytedeco.javacpp.cuda")
+@NoException
 public class cuda implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("__volatile__", "__no_return__", "__noinline__", "__forceinline__", "__thread__", "__restrict__",

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/presets/cudnn.java b/cuda/src/main/java/org/bytedeco/javacpp/presets/cudnn.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -35,6 +36,7 @@
 @Properties(inherit = cuda.class, value = {
     @Platform(include = "<cudnn.h>", link = "cudnn@.7")},
         target = "org.bytedeco.javacpp.cudnn")
+@NoException
 public class cudnn implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("CUDNNWINAPI").cppTypes().annotations().cppText(""))

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/presets/cufft.java b/cuda/src/main/java/org/bytedeco/javacpp/presets/cufft.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -35,6 +36,7 @@
 @Properties(inherit = cuda.class, value = {
     @Platform(include = "<cufft.h>", link = "cufft@.9.1")},
         target = "org.bytedeco.javacpp.cufft")
+@NoException
 public class cufft implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("CUFFTAPI").cppTypes().annotations().cppText(""))

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/presets/cufftw.java b/cuda/src/main/java/org/bytedeco/javacpp/presets/cufftw.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -35,6 +36,7 @@
 @Properties(inherit = cufft.class, value = {
     @Platform(include = "<cufftw.h>", link = "cufftw@.9.1")},
         target = "org.bytedeco.javacpp.cufftw")
+@NoException
 public class cufftw implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("!defined(FFTW_NO_Complex) && defined(_Complex_I) && defined (complex)").define(false));

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/presets/curand.java b/cuda/src/main/java/org/bytedeco/javacpp/presets/curand.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -35,6 +36,7 @@
 @Properties(inherit = cuda.class, value = {
     @Platform(include = "<curand.h>", link = "curand@.9.1")},
         target = "org.bytedeco.javacpp.curand")
+@NoException
 public class curand implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("CURANDAPI").cppTypes().annotations().cppText(""))

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/presets/cusolver.java b/cuda/src/main/java/org/bytedeco/javacpp/presets/cusolver.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -35,6 +36,7 @@
 @Properties(inherit = {cublas.class, cusparse.class}, value = {
     @Platform(include = {"<cusolver_common.h>", "<cusolverDn.h>", "<cusolverRf.h>", "cusolverSp.h"}, link = "cusolver@.9.1")},
         target = "org.bytedeco.javacpp.cusolver")
+@NoException
 public class cusolver implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("CUDENSEAPI", "CRFWINAPI", "CUSOLVERAPI").cppTypes().annotations().cppText(""))

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/presets/cusparse.java b/cuda/src/main/java/org/bytedeco/javacpp/presets/cusparse.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -35,6 +36,7 @@
 @Properties(inherit = cuda.class, value = {
     @Platform(include = "<cusparse.h>", link = "cusparse@.9.1")},
         target = "org.bytedeco.javacpp.cusparse")
+@NoException
 public class cusparse implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("CUSPARSEAPI").cppTypes().annotations().cppText(""))

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/presets/nppc.java b/cuda/src/main/java/org/bytedeco/javacpp/presets/nppc.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -35,6 +36,7 @@
 @Properties(inherit = cuda.class, value = {
     @Platform(include = {"<npp.h>", "<nppversion.h>", "<nppdefs.h>", "<nppcore.h>"}, link = "nppc@.9.1")},
         target = "org.bytedeco.javacpp.nppc")
+@NoException
 public class nppc implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("NPP_MAX_64U").translate(false));

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/presets/nppi.java b/cuda/src/main/java/org/bytedeco/javacpp/presets/nppi.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -42,6 +43,7 @@
             link = {"nppial@.9.1", "nppicc@.9.1", "nppicom@.9.1", "nppidei@.9.1", "nppif@.9.1",
                     "nppig@.9.1", "nppim@.9.1", "nppist@.9.1", "nppisu@.9.1", "nppitc@.9.1"} )},
         target = "org.bytedeco.javacpp.nppi")
+@NoException
 public class nppi implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("nppiHLSToBGR_8u_AC4R", "nppiNormRelInfGetBufferHostSize_32s_C1R", "nppiSub_32s_C4IRSfs", "nppiSub_32s_C4RSfs").skip());

diff --git a/cuda/src/main/java/org/bytedeco/javacpp/presets/npps.java b/cuda/src/main/java/org/bytedeco/javacpp/presets/npps.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -37,6 +38,7 @@
             "<npps_conversion_functions.h>", "<npps_arithmetic_and_logical_operations.h>",
             "<npps_statistics_functions.h>", "<npps_filtering_functions.h>"}, link = "npps@.9.1")},
         target = "org.bytedeco.javacpp.npps")
+@NoException
 public class npps implements InfoMapper {
     public void map(InfoMap infoMap) {
     }

diff --git a/fftw/src/main/java/org/bytedeco/javacpp/presets/fftw3.java b/fftw/src/main/java/org/bytedeco/javacpp/presets/fftw3.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -32,10 +33,11 @@
  *
  * @author Samuel Audet
  */
-@Properties(target="org.bytedeco.javacpp.fftw3", value={
-    @Platform(include="<fftw3.h>", link={"fftw3@.3", "fftw3f@.3"}),
-    @Platform(value="android", link={"fftw3", "fftw3f"}),
-    @Platform(value="windows", preload={"libfftw3-3", "libfftw3f-3"}) })
+@Properties(target = "org.bytedeco.javacpp.fftw3", value = {
+    @Platform(include = "<fftw3.h>", link = {"fftw3@.3", "fftw3f@.3"}),
+    @Platform(value = "android", link = {"fftw3", "fftw3f"}),
+    @Platform(value = "windows", preload = {"libfftw3-3", "libfftw3f-3"}) })
+@NoException
 public class fftw3 implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("!defined(FFTW_NO_Complex) && defined(_Complex_I) && defined(complex) && defined(I)").define(false))

diff --git a/gsl/src/main/java/org/bytedeco/javacpp/gsl.java b/gsl/src/main/java/org/bytedeco/javacpp/gsl.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/gsl/src/main/java/org/bytedeco/javacpp/presets/gsl.java b/gsl/src/main/java/org/bytedeco/javacpp/presets/gsl.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -32,8 +33,8 @@
  *
  * @author Samuel Audet
  */
-@Properties(target="org.bytedeco.javacpp.gsl", value={
-    @Platform(include={"gsl/gsl_types.h", "gsl/gsl_errno.h", "gsl/gsl_ieee_utils.h", "gsl/gsl_inline.h", "gsl/gsl_message.h", "gsl/gsl_complex.h",
+@Properties(target = "org.bytedeco.javacpp.gsl", value = {
+    @Platform(include = {"gsl/gsl_types.h", "gsl/gsl_errno.h", "gsl/gsl_ieee_utils.h", "gsl/gsl_inline.h", "gsl/gsl_message.h", "gsl/gsl_complex.h",
         "gsl/gsl_complex_math.h", "gsl/gsl_check_range.h", "gsl/gsl_sys.h", "gsl/gsl_machine.h", "gsl/gsl_precision.h", "gsl/gsl_nan.h", "gsl/gsl_pow_int.h",
         "gsl/gsl_math.h", "gsl/gsl_min.h", "gsl/gsl_minmax.h", "gsl/gsl_mode.h", "gsl/gsl_test.h", "gsl/gsl_version.h",
 
@@ -96,9 +97,10 @@
         "gsl/gsl_statistics.h", /*"gsl/gsl_statistics_long_double.h",*/ "gsl/gsl_statistics_double.h", "gsl/gsl_statistics_float.h",
         "gsl/gsl_statistics_ulong.h", "gsl/gsl_statistics_long.h", "gsl/gsl_statistics_uint.h", "gsl/gsl_statistics_int.h",
         "gsl/gsl_statistics_ushort.h", "gsl/gsl_statistics_short.h", "gsl/gsl_statistics_uchar.h", "gsl/gsl_statistics_char.h"}, 
-                               link={"gslcblas@.0", "gsl@.23"}),
-    @Platform(value="android", link={"gslcblas",    "gsl"}),
-    @Platform(value="windows", preload={"libgslcblas-0", "libgsl-23"}) })
+                                 link = {"gslcblas@.0", "gsl@.23"}),
+    @Platform(value = "android", link = {"gslcblas",    "gsl"}),
+    @Platform(value = "windows", preload = {"libgslcblas-0", "libgsl-23"}) })
+@NoException
 public class gsl implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("__cplusplus").define())

diff --git a/leptonica/src/main/java/org/bytedeco/javacpp/lept.java b/leptonica/src/main/java/org/bytedeco/javacpp/lept.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/leptonica/src/main/java/org/bytedeco/javacpp/presets/lept.java b/leptonica/src/main/java/org/bytedeco/javacpp/presets/lept.java
@@ -22,6 +22,7 @@
 
 package org.bytedeco.javacpp.presets;
 
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -32,16 +33,17 @@
  *
  * @author Samuel Audet
  */
-@Properties(target="org.bytedeco.javacpp.lept", value={
-    @Platform(include={"leptonica/alltypes.h", "leptonica/environ.h", "leptonica/array.h", "leptonica/bbuffer.h", "leptonica/heap.h", "leptonica/list.h",
+@Properties(target = "org.bytedeco.javacpp.lept", value = {
+    @Platform(include = {"leptonica/alltypes.h", "leptonica/environ.h", "leptonica/array.h", "leptonica/bbuffer.h", "leptonica/heap.h", "leptonica/list.h",
         "leptonica/ptra.h", "leptonica/queue.h", "leptonica/rbtree.h", "leptonica/stack.h", "leptonica/arrayaccess.h", "leptonica/bmf.h", "leptonica/ccbord.h",
         "leptonica/dewarp.h", "leptonica/gplot.h", "leptonica/imageio.h", "leptonica/jbclass.h", "leptonica/morph.h", "leptonica/pix.h",
         "leptonica/recog.h", "leptonica/regutils.h", "leptonica/stringcode.h", "leptonica/sudoku.h", "leptonica/watershed.h", "leptonica/allheaders.h"},
-        link="lept@.5", resource = {"include", "lib"}),
-    @Platform(value="android", link="lept"),
-    @Platform(value="windows", link="liblept", preload={"libwinpthread-1", "libgcc_s_dw2-1", "libgcc_s_seh-1", "libstdc++-6", "liblept-5"}),
-    @Platform(value="windows-x86", preloadpath="C:/msys64/mingw32/bin/"),
-    @Platform(value="windows-x86_64", preloadpath="C:/msys64/mingw64/bin/") })
+        link = "lept@.5", resource = {"include", "lib"}),
+    @Platform(value = "android", link = "lept"),
+    @Platform(value = "windows", link = "liblept", preload = {"libwinpthread-1", "libgcc_s_dw2-1", "libgcc_s_seh-1", "libstdc++-6", "liblept-5"}),
+    @Platform(value = "windows-x86", preloadpath = "C:/msys64/mingw32/bin/"),
+    @Platform(value = "windows-x86_64", preloadpath = "C:/msys64/mingw64/bin/") })
+@NoException
 public class lept implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("LEPT_DLL", "LIBJP2K_HEADER", "L_END_LIST").cppTypes().annotations())

diff --git a/libdc1394/src/main/java/org/bytedeco/javacpp/dc1394.java b/libdc1394/src/main/java/org/bytedeco/javacpp/dc1394.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/libdc1394/src/main/java/org/bytedeco/javacpp/presets/dc1394.java b/libdc1394/src/main/java/org/bytedeco/javacpp/presets/dc1394.java
@@ -27,6 +27,7 @@
 import org.bytedeco.javacpp.Loader;
 import org.bytedeco.javacpp.Pointer;
 import org.bytedeco.javacpp.annotation.Cast;
+import org.bytedeco.javacpp.annotation.NoException;
 import org.bytedeco.javacpp.annotation.Platform;
 import org.bytedeco.javacpp.annotation.Properties;
 import org.bytedeco.javacpp.tools.Info;
@@ -45,6 +46,7 @@
     @Platform(value = "windows", include = {"<dc1394/dc1394.h>", "<dc1394/types.h>", "<dc1394/log.h>",
         "<dc1394/camera.h>", "<dc1394/control.h>", "<dc1394/capture.h>", "<dc1394/conversions.h>", "<dc1394/format7.h>",
         "<dc1394/iso.h>", "<dc1394/register.h>", "<dc1394/video.h>", "<dc1394/utils.h>"}, preload = {"libdc1394-22", "libusb-1.0"}) })
+@NoException
 public class dc1394 implements InfoMapper {
     public void map(InfoMap infoMap) {
         infoMap.put(new Info("poll.h").skip())

diff --git a/libfreenect/src/main/java/org/bytedeco/javacpp/freenect.java b/libfreenect/src/main/java/org/bytedeco/javacpp/freenect.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.1-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;