Update version in the pom.xml files to 1.3-SNAPSHOT

bytedeco · Dec 4, 2016 · 7dbebff · 7dbebff
1 parent 445d6e6
commit 7dbebff
Show file tree

Hide file tree

Showing 108 changed files with 755 additions and 728 deletions.
diff --git a/artoolkitplus/platform/pom.xml b/artoolkitplus/platform/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

diff --git a/artoolkitplus/pom.xml b/artoolkitplus/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
 
   <groupId>org.bytedeco.javacpp-presets</groupId>

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

diff --git a/caffe/platform/pom.xml b/caffe/platform/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

diff --git a/caffe/pom.xml b/caffe/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
 
   <groupId>org.bytedeco.javacpp-presets</groupId>

diff --git a/caffe/src/main/java/org/bytedeco/javacpp/caffe.java b/caffe/src/main/java/org/bytedeco/javacpp/caffe.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 
@@ -20528,7 +20528,7 @@ public native void Backward(@Const @ByRef DoubleBlobVector top,
   // If there are two top blobs, then the second blob will contain
   // accuracies per class.
   @Virtual public native int MinTopBlobs();
-  @Virtual public native int MaxTopBlos();
+  @Virtual public native int MaxTopBlobs();
   @Virtual protected native void Forward_cpu(@Const @ByRef FloatBlobVector bottom,
         @Const @ByRef FloatBlobVector top);
   @Virtual protected native void Backward_cpu(@Const @ByRef FloatBlobVector top,
@@ -20560,7 +20560,7 @@ public native void Backward(@Const @ByRef DoubleBlobVector top,
   // If there are two top blobs, then the second blob will contain
   // accuracies per class.
   @Virtual public native int MinTopBlobs();
-  @Virtual public native int MaxTopBlos();
+  @Virtual public native int MaxTopBlobs();
   @Virtual protected native void Forward_cpu(@Const @ByRef DoubleBlobVector bottom,
         @Const @ByRef DoubleBlobVector top);
   @Virtual protected native void Backward_cpu(@Const @ByRef DoubleBlobVector top,
@@ -21175,10 +21175,14 @@ public native void Backward(@Const @ByRef DoubleBlobVector top,
   @Virtual public native @Cast("const char*") BytePointer type();
   @Virtual protected native void Forward_cpu(@Const @ByRef FloatBlobVector bottom,
         @Const @ByRef FloatBlobVector top);
+  @Virtual protected native void Forward_gpu(@Const @ByRef FloatBlobVector bottom,
+        @Const @ByRef FloatBlobVector top);
   @Virtual protected native void Backward_cpu(@Const @ByRef FloatBlobVector top,
         @Const @ByRef BoolVector propagate_down, @Const @ByRef FloatBlobVector bottom);
   @Virtual protected native void Backward_gpu(@Const @ByRef FloatBlobVector top,
         @Const @ByRef BoolVector propagate_down, @Const @ByRef FloatBlobVector bottom);
+  @Virtual protected native float get_normalizer(
+        @Cast("caffe::LossParameter_NormalizationMode") int normalization_mode, int valid_count);
 }
 @Name("caffe::SigmoidCrossEntropyLossLayer<double>") @NoOffset public static class DoubleSigmoidCrossEntropyLossLayer extends DoubleLossLayer {
     static { Loader.load(); }
@@ -21195,10 +21199,14 @@ public native void Backward(@Const @ByRef DoubleBlobVector top,
   @Virtual public native @Cast("const char*") BytePointer type();
   @Virtual protected native void Forward_cpu(@Const @ByRef DoubleBlobVector bottom,
         @Const @ByRef DoubleBlobVector top);
+  @Virtual protected native void Forward_gpu(@Const @ByRef DoubleBlobVector bottom,
+        @Const @ByRef DoubleBlobVector top);
   @Virtual protected native void Backward_cpu(@Const @ByRef DoubleBlobVector top,
         @Const @ByRef BoolVector propagate_down, @Const @ByRef DoubleBlobVector bottom);
   @Virtual protected native void Backward_gpu(@Const @ByRef DoubleBlobVector top,
         @Const @ByRef BoolVector propagate_down, @Const @ByRef DoubleBlobVector bottom);
+  @Virtual protected native double get_normalizer(
+        @Cast("caffe::LossParameter_NormalizationMode") int normalization_mode, int valid_count);
 }
 
   // namespace caffe

diff --git a/chilitags/platform/pom.xml b/chilitags/platform/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

diff --git a/chilitags/pom.xml b/chilitags/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
 
   <groupId>org.bytedeco.javacpp-presets</groupId>

diff --git a/chilitags/src/main/java/org/bytedeco/javacpp/chilitags.java b/chilitags/src/main/java/org/bytedeco/javacpp/chilitags.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 
@@ -199,19 +199,19 @@ Values of the parameter to tell find() how to combine tracking and full
     \li The *tracking* compares two succesive input images and tries to update
     the position of tags that were previously detected. This process is
     significantly faster than the full detection, but can not detect new tags.
-*/
+ */
 /** enum chilitags::Chilitags::DetectionTrigger */
 public static final int
 /**
     First track results of the previous call to find(), then run a full
     detection on the same input image. The detected position overrides the
     position resulting from tracking if the same tag is both tracked and
-    detected. 
+    detected.
     <p>
     This improves the robustness of the detection, e.g. in the case where the
     tag has already been detected previously, but moves too fast to be detected
     again.
-*/
+ */
     TRACK_AND_DETECT = 0,
 
 /**
@@ -223,7 +223,7 @@ but may result in decreased detection performances when the tags move (due
      {@code DETECT_ONLY} is however useful when Chilitags processes sequence of
      unrelated images, e.g.  in the batch processing of still images. In this
      case, tracking is useless and most likely generates false positives.
-*/
+ */
     DETECT_ONLY = 1,
 
 /**
@@ -240,7 +240,7 @@ run explicitely to detect (and then track) those. {@code TRACK_ONLY} is hence
     <p>
     Another interesting use case is to call {@code find()} with {@code TRACK_ONLY} as long
     as an expected (set of) tag(s) is found, and with {@code DETECT_ONLY} otherwise.
-*/
+ */
     TRACK_ONLY = 2,
 
 /**
@@ -253,7 +253,7 @@ as an expected (set of) tag(s) is found, and with {@code DETECT_ONLY} otherwise.
     full detection. It defaults to 15, i.e. out of 15 consecutive calls to
     {@code find()}, 1 will use a full detection, and the 14 others will only track
     previous results.
-*/
+ */
     DETECT_PERIODICALLY = 3,
 
     /**
@@ -313,7 +313,7 @@ as an expected (set of) tag(s) is found, and with {@code DETECT_ONLY} otherwise.
     default is 15, which means that out of 15 consecutive calls to find(),
     one will use a full detection, and the 14 others will only track
     previous results.
-*/
+ */
 public native void setDetectionPeriod(int period);
 
 /**
@@ -324,23 +324,23 @@ Preset groups of parameters (for setPerformance()) to adjust  the
 public static final int
 /**
     Favor speed over accuracy: no corner refinment, no subsampling.
-*/
+ */
     FASTER = 0,
 /**
     Balance speed and accuracy (default): corners are refined, no subsampling.
-*/
+ */
     FAST = 1,
 /**
     Favor robustness over accuracy: corner are refined, input is
     subsampled down to 160 pixels wide.
-*/
+ */
     ROBUST = 2;
 
 /**
     Applies one of the performance tuning preset (See PerformancePreset). To
     tune more finely the performance trade-offs, see setCornerRefinment(),
     setMaxInputWidth(), and setMinInputWidth().
-*/
+ */
 public native void setPerformance(@Cast("chilitags::Chilitags::PerformancePreset") int preset);
 
 //@{
@@ -499,9 +499,9 @@ detection anyway. This parameter is overridden by readCalibration() or
     convention to code the rotation and translation parameters in homogeneous
     coordinates:
     <pre>{@literal
-    { r11 , r12 , r13 , tx 
-      r21 , r22 , r23 , ty 
-      r31 , r32 , r33 , tz 
+    { r11 , r12 , r13 , tx
+      r21 , r22 , r23 , ty
+      r31 , r32 , r33 , tz
         0 ,   0 ,   0 ,  1 }
     }</pre>
     @param tags a list of tags, as returned by Chilitags::find().
@@ -525,9 +525,9 @@ This is a convenience variant of estimate() which also takes care of the
     convention to code the rotation and translation parameters in homogeneous
     coordinates:
     <pre>{@literal
-    { r11 , r12 , r13 , tx 
-      r21 , r22 , r23 , ty 
-      r31 , r32 , r33 , tz 
+    { r11 , r12 , r13 , tx
+      r21 , r22 , r23 , ty
+      r31 , r32 , r33 , tz
         0 ,   0 ,   0 ,  1 }
     }</pre>
     <p>
@@ -689,12 +689,12 @@ public native void setCalibration(@ByVal UMat newCameraMatrix,
 
 /**
     Returns the camera matrix used for the pose estimation.
-*/
+ */
 public native @Const @ByRef Mat getCameraMatrix();
 
 /**
     Returns the distortion coefficients used for the pose estimation.
-*/
+ */
 public native @Const @ByRef Mat getDistortionCoeffs();
 
 }
@@ -762,9 +762,9 @@ detection anyway. This parameter is overridden by readCalibration() or
     convention to code the rotation and translation parameters in homogeneous
     coordinates:
     <pre>{@literal
-    { r11 , r12 , r13 , tx 
-      r21 , r22 , r23 , ty 
-      r31 , r32 , r33 , tz 
+    { r11 , r12 , r13 , tx
+      r21 , r22 , r23 , ty
+      r31 , r32 , r33 , tz
         0 ,   0 ,   0 ,  1 }
     }</pre>
     @param tags a list of tags, as returned by Chilitags::find().
@@ -788,9 +788,9 @@ This is a convenience variant of estimate() which also takes care of the
     convention to code the rotation and translation parameters in homogeneous
     coordinates:
     <pre>{@literal
-    { r11 , r12 , r13 , tx 
-      r21 , r22 , r23 , ty 
-      r31 , r32 , r33 , tz 
+    { r11 , r12 , r13 , tx
+      r21 , r22 , r23 , ty
+      r31 , r32 , r33 , tz
         0 ,   0 ,   0 ,  1 }
     }</pre>
     <p>
@@ -952,12 +952,12 @@ public native void setCalibration(@ByVal UMat newCameraMatrix,
 
 /**
     Returns the camera matrix used for the pose estimation.
-*/
+ */
 public native @Const @ByRef Mat getCameraMatrix();
 
 /**
     Returns the distortion coefficients used for the pose estimation.
-*/
+ */
 public native @Const @ByRef Mat getDistortionCoeffs();
 
 }

diff --git a/cuda/platform/pom.xml b/cuda/platform/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 

diff --git a/cuda/pom.xml b/cuda/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
 
   <groupId>org.bytedeco.javacpp-presets</groupId>

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.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-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.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

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.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-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.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-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.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-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.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-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.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-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.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-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.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-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.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-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.2.5-SNAPSHOT: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/ffmpeg/platform/pom.xml b/ffmpeg/platform/pom.xml
@@ -6,13 +6,13 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
 
   <groupId>org.bytedeco.javacpp-presets</groupId>
   <artifactId>ffmpeg-platform</artifactId>
-  <version>3.1.4-${project.parent.version}</version>
+  <version>3.2.1-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for FFmpeg</name>
 
   <properties>

diff --git a/ffmpeg/pom.xml b/ffmpeg/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.bytedeco</groupId>
     <artifactId>javacpp-presets</artifactId>
-    <version>1.2.5-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
   </parent>
 
   <groupId>org.bytedeco.javacpp-presets</groupId>