Skip to content

Commit

Permalink
* Fix java.lang.UnsatisfiedLinkError when allocating `opencv_core.…
Browse files Browse the repository at this point in the history
…Mat`, among others ([issue javacv:9](bytedeco/javacv#9) and [issue javacv:28](bytedeco/javacv#28))
  • Loading branch information
saudet committed Sep 15, 2014
1 parent 14d8f22 commit 0b9f1d1
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

* Fix `java.lang.UnsatisfiedLinkError` when allocating `opencv_core.Mat`, among others ([issue javacv:9](https://github.com/bytedeco/javacv/issues/9) and [issue javacv:28](https://github.com/bytedeco/javacv/issues/28))
* Force OpenCV to build with GCC 4.6, as newer versions are known to hang on Android 2.2 ([issue android:43819](https://code.google.com/p/android/issues/detail?id=43819))
* Upgrade presets for videoInput, where the latest code got merged into the master branch
* Add callbacks for Tesseract according to new functionality in JavaCPP
Expand Down
12 changes: 12 additions & 0 deletions opencv/src/main/java/org/bytedeco/javacpp/helper/opencv_core.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
public class opencv_core extends org.bytedeco.javacpp.presets.opencv_core {

public static abstract class AbstractArray extends Pointer {
static { Loader.load(); }
public AbstractArray() { }
public AbstractArray(Pointer p) { super(p); }

Expand Down Expand Up @@ -1540,6 +1541,7 @@ protected static class ReleaseDeallocator extends CvSparseMat implements Pointer
}

public static abstract class AbstractCvRect extends IntPointer {
static { Loader.load(); }
public AbstractCvRect() { }
public AbstractCvRect(Pointer p) { super(p); }

Expand Down Expand Up @@ -1572,6 +1574,7 @@ public AbstractCvRect() { }
}

public static abstract class AbstractCvPoint extends IntPointer {
static { Loader.load(); }
public AbstractCvPoint() { }
public AbstractCvPoint(Pointer p) { super(p); }

Expand Down Expand Up @@ -1669,6 +1672,7 @@ public CvPoint put(byte shift, CvPoint2D64f o) {
}

public static abstract class AbstractCvPoint2D32f extends FloatPointer {
static { Loader.load(); }
public AbstractCvPoint2D32f() { }
public AbstractCvPoint2D32f(Pointer p) { super(p); }

Expand Down Expand Up @@ -1743,6 +1747,7 @@ public CvPoint2D32f put(CvPoint2D64f o) {
}

public static abstract class AbstractCvPoint3D32f extends FloatPointer {
static { Loader.load(); }
public AbstractCvPoint3D32f() { }
public AbstractCvPoint3D32f(Pointer p) { super(p); }

Expand Down Expand Up @@ -1819,6 +1824,7 @@ public CvPoint3D32f put(CvPoint2D64f o) {
}

public static abstract class AbstractCvPoint2D64f extends DoublePointer {
static { Loader.load(); }
public AbstractCvPoint2D64f() { }
public AbstractCvPoint2D64f(Pointer p) { super(p); }

Expand Down Expand Up @@ -1893,6 +1899,7 @@ public CvPoint2D64f put(CvPoint2D64f o) {
}

public static abstract class AbstractCvPoint3D64f extends DoublePointer {
static { Loader.load(); }
public AbstractCvPoint3D64f() { }
public AbstractCvPoint3D64f(Pointer p) { super(p); }

Expand Down Expand Up @@ -1969,6 +1976,7 @@ public CvPoint3D64f put(CvPoint2D64f o) {
}

public static abstract class AbstractCvSize extends IntPointer {
static { Loader.load(); }
public AbstractCvSize() { }
public AbstractCvSize(Pointer p) { super(p); }

Expand Down Expand Up @@ -2000,6 +2008,7 @@ public AbstractCvSize() { }
}

public static abstract class AbstractCvSize2D32f extends FloatPointer {
static { Loader.load(); }
public AbstractCvSize2D32f() { }
public AbstractCvSize2D32f(Pointer p) { super(p); }

Expand Down Expand Up @@ -2030,6 +2039,7 @@ public AbstractCvSize2D32f() { }
}

public static abstract class AbstractCvBox2D extends FloatPointer {
static { Loader.load(); }
public AbstractCvBox2D() { }
public AbstractCvBox2D(Pointer p) { super(p); }

Expand Down Expand Up @@ -2061,6 +2071,7 @@ public AbstractCvBox2D() { }
}

public static abstract class AbstractCvScalar extends DoublePointer {
static { Loader.load(); }
public AbstractCvScalar() { }
public AbstractCvScalar(Pointer p) { super(p); }

Expand Down Expand Up @@ -2135,6 +2146,7 @@ public static CvScalar CV_RGB(double r, double g, double b) {
}

public static abstract class AbstractCvMemStorage extends Pointer {
static { Loader.load(); }
public AbstractCvMemStorage() { }
public AbstractCvMemStorage(Pointer p) { super(p); }

Expand Down

0 comments on commit 0b9f1d1

Please sign in to comment.