Skip to content

Commit ba4c7a2

Browse files
committed
Release version 1.5.3
1 parent 288cc6c commit ba4c7a2

File tree

6,903 files changed

+17483
-7954
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

6,903 files changed

+17483
-7954
lines changed

.appveyor.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cache:
88

99
environment:
1010
matrix:
11-
- PROJ: "opencv,artoolkitplus,chilitags,flandmark"
11+
- PROJ: "opencv,artoolkitplus,chilitags,flandmark,gym"
1212
OS: windows-x86
1313
- PROJ: "ffmpeg"
1414
OS: windows-x86
@@ -22,7 +22,7 @@ environment:
2222
OS: windows-x86
2323
- PROJ: "arpack-ng,cminpack,fftw,gsl"
2424
OS: windows-x86
25-
- PROJ: "cpython,numpy,scipy,gym"
25+
- PROJ: "cpython,numpy,scipy"
2626
OS: windows-x86
2727
- PROJ: "llvm"
2828
OS: windows-x86
@@ -35,7 +35,7 @@ environment:
3535
- PROJ: "cpu_features,systems"
3636
OS: windows-x86
3737

38-
- PROJ: "opencv,artoolkitplus,chilitags,flandmark"
38+
- PROJ: "opencv,artoolkitplus,chilitags,flandmark,gym"
3939
OS: windows-x86_64
4040
- PROJ: "ffmpeg"
4141
OS: windows-x86_64
@@ -55,7 +55,7 @@ environment:
5555
OS: windows-x86_64
5656
- PROJ: "arpack-ng,cminpack,fftw,gsl"
5757
OS: windows-x86_64
58-
- PROJ: "cpython,numpy,scipy,gym"
58+
- PROJ: "cpython,numpy,scipy"
5959
OS: windows-x86_64
6060
- PROJ: "llvm"
6161
OS: windows-x86_64

.travis.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ matrix:
288288
script: ./ci/install-ppc.sh
289289

290290
- os: linux
291-
env: PROJ=opencv,artoolkitplus,chilitags,flandmark OS=linux-x86
291+
env: PROJ=opencv,artoolkitplus,chilitags,flandmark,gym OS=linux-x86
292292
install: true
293293
script: ./ci/install-travis.sh
294294
- os: linux
@@ -316,7 +316,7 @@ matrix:
316316
install: true
317317
script: ./ci/install-travis.sh
318318
- os: linux
319-
env: PROJ=cpython,numpy,scipy,gym OS=linux-x86
319+
env: PROJ=cpython,numpy,scipy OS=linux-x86
320320
install: true
321321
script: ./ci/install-travis.sh
322322
- os: linux
@@ -357,7 +357,7 @@ matrix:
357357
script: ./ci/install-travis.sh
358358

359359
- os: linux
360-
env: PROJ=opencv,artoolkitplus,chilitags,flandmark OS=linux-x86_64
360+
env: PROJ=opencv,artoolkitplus,chilitags,flandmark,gym OS=linux-x86_64
361361
install: true
362362
script: ./ci/install-travis.sh
363363
- os: linux
@@ -397,7 +397,7 @@ matrix:
397397
install: true
398398
script: ./ci/install-travis.sh
399399
- os: linux
400-
env: PROJ=cpython,numpy,scipy,gym OS=linux-x86_64
400+
env: PROJ=cpython,numpy,scipy OS=linux-x86_64
401401
install: true
402402
script: ./ci/install-travis.sh
403403
- os: linux
@@ -467,7 +467,7 @@ matrix:
467467

468468
- os: osx
469469
osx_image: xcode9.3
470-
env: PROJ=opencv,artoolkitplus,chilitags,flandmark OS=macosx-x86_64
470+
env: PROJ=opencv,artoolkitplus,chilitags,flandmark,gym OS=macosx-x86_64
471471
install: true
472472
script: ./ci/install-travis.sh
473473
- os: osx
@@ -517,7 +517,7 @@ matrix:
517517
script: ./ci/install-travis.sh
518518
- os: osx
519519
osx_image: xcode9.3
520-
env: PROJ=cpython,numpy,scipy,gym OS=macosx-x86_64
520+
env: PROJ=cpython,numpy,scipy OS=macosx-x86_64
521521
install: true
522522
script: ./ci/install-travis.sh
523523
- os: osx

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11

2+
### April 14, 2020 version 1.5.3
23
* Add presets for the new `intensity_transform` and `rapid` modules of OpenCV
34
* Add support for Polly optimizer to presets for LLVM ([pull #864](https://github.com/bytedeco/javacpp-presets/pull/864))
45
* Fix loading issue with `opencv_dnn_superres` ([issue bytedeco/javacv#1396](https://github.com/bytedeco/javacv/issues/1396))

README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,27 +24,27 @@ We can also have everything downloaded and installed automatically with:
2424
<dependency>
2525
<groupId>org.bytedeco</groupId>
2626
<artifactId>${moduleName}-platform</artifactId>
27-
<version>${moduleVersion}-1.5.2</version>
27+
<version>${moduleVersion}-1.5.3</version>
2828
</dependency>
2929
```
3030

3131
* Gradle (inside the `build.gradle` file)
3232
```groovy
3333
dependencies {
34-
compile group: 'org.bytedeco', name: moduleName + '-platform', version: moduleVersion + '-1.5.2'
34+
compile group: 'org.bytedeco', name: moduleName + '-platform', version: moduleVersion + '-1.5.3'
3535
}
3636
```
3737

3838
* Leiningen (inside the `project.clj` file)
3939
```clojure
4040
:dependencies [
41-
[~(symbol (str "org.bytedeco/" moduleName "-platform")) ~(str moduleVersion "-1.5.2")]
41+
[~(symbol (str "org.bytedeco/" moduleName "-platform")) ~(str moduleVersion "-1.5.3")]
4242
]
4343
```
4444

4545
* sbt (inside the `build.sbt` file)
4646
```scala
47-
libraryDependencies += "org.bytedeco" % moduleName + "-platform" % moduleVersion + "-1.5.2"
47+
libraryDependencies += "org.bytedeco" % moduleName + "-platform" % moduleVersion + "-1.5.3"
4848
```
4949

5050
where the `moduleName` and `moduleVersion` variables correspond to the desired module. This downloads binaries for all platforms, but to get binaries for only one platform we can set the `javacpp.platform` system property (via the `-D` command line option) to something like `android-arm`, `linux-x86_64`, `macosx-x86_64`, `windows-x86_64`, etc. We can also specify more than one platform, see the examples at [Reducing the Number of Dependencies](https://github.com/bytedeco/javacpp-presets/wiki/Reducing-the-Number-of-Dependencies). Another option available for Scala users is [sbt-javacpp](https://github.com/bytedeco/sbt-javacpp).
@@ -102,7 +102,7 @@ Additionally, one can find on the wiki page additional information about the rec
102102
The JavaCPP Presets depend on Maven, a powerful build system for Java, so before attempting a build, be sure to install and read up on:
103103

104104
* Maven 3.x http://maven.apache.org/download.html
105-
* JavaCPP 1.5.2 https://github.com/bytedeco/javacpp
105+
* JavaCPP 1.5.3 https://github.com/bytedeco/javacpp
106106

107107
Each child module in turn relies by default on the included [`cppbuild.sh` scripts](#the-cppbuildsh-scripts), explained below, to install its corresponding native libraries in the `cppbuild` subdirectory. To use native libraries already installed somewhere else on the system, other installation directories than `cppbuild` can also be specified either in the `pom.xml` files or in the `.java` configuration files. The following versions are supported:
108108

@@ -123,8 +123,8 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
123123
* HDF5 1.12.0 https://www.hdfgroup.org/downloads/
124124
* Hyperscan 5.2.x https://github.com/intel/hyperscan
125125
* MKL 2020.x https://software.intel.com/intel-mkl
126-
* MKL-DNN 0.21.x https://github.com/intel/mkl-dnn
127-
* DNNL 1.3.x https://github.com/intel/mkl-dnn
126+
* MKL-DNN 0.21.x https://github.com/oneapi-src/oneDNN
127+
* DNNL 1.3.x https://github.com/oneapi-src/oneDNN
128128
* OpenBLAS 0.3.9 http://www.openblas.net/
129129
* ARPACK-NG 3.7.0 https://github.com/opencollab/arpack-ng
130130
* CMINPACK 1.3.6 https://github.com/devernay/cminpack
@@ -134,7 +134,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
134134
* NumPy 1.18.x https://github.com/numpy/numpy
135135
* SciPy 1.4.x https://github.com/scipy/scipy
136136
* Gym 0.17.x https://github.com/openai/gym
137-
* LLVM 9.0.x http://llvm.org/releases/download.html
137+
* LLVM 10.0.x http://llvm.org/releases/download.html
138138
* libpostal 1.1-alpha https://github.com/openvenues/libpostal
139139
* Leptonica 1.79.0 http://www.leptonica.org/download.html
140140
* Tesseract 4.1.1 https://github.com/tesseract-ocr/tesseract

ale/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
3434
<modelVersion>4.0.0</modelVersion>
3535
<groupId>org.bytedeco.ale</groupId>
3636
<artifactId>sharedlibraryinterfaceexample</artifactId>
37-
<version>1.5.3-SNAPSHOT</version>
37+
<version>1.5.3</version>
3838
<properties>
3939
<exec.mainClass>SharedLibraryInterfaceExample</exec.mainClass>
4040
</properties>
4141
<dependencies>
4242
<dependency>
4343
<groupId>org.bytedeco</groupId>
4444
<artifactId>ale-platform</artifactId>
45-
<version>0.6.1-1.5.3-SNAPSHOT</version>
45+
<version>0.6.1-1.5.3</version>
4646
</dependency>
4747
</dependencies>
4848
<build>

ale/platform/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.bytedeco</groupId>
88
<artifactId>javacpp-presets</artifactId>
9-
<version>1.5.3-SNAPSHOT</version>
9+
<version>1.5.3</version>
1010
<relativePath>../../</relativePath>
1111
</parent>
1212

ale/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.bytedeco</groupId>
88
<artifactId>javacpp-presets</artifactId>
9-
<version>1.5.3-SNAPSHOT</version>
9+
<version>1.5.3</version>
1010
</parent>
1111

1212
<groupId>org.bytedeco</groupId>

ale/samples/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.bytedeco.ale</groupId>
44
<artifactId>sharedlibraryinterfaceexample</artifactId>
5-
<version>1.5.3-SNAPSHOT</version>
5+
<version>1.5.3</version>
66
<properties>
77
<exec.mainClass>SharedLibraryInterfaceExample</exec.mainClass>
88
</properties>
99
<dependencies>
1010
<dependency>
1111
<groupId>org.bytedeco</groupId>
1212
<artifactId>ale-platform</artifactId>
13-
<version>0.6.1-1.5.3-SNAPSHOT</version>
13+
<version>0.6.1-1.5.3</version>
1414
</dependency>
1515
</dependencies>
1616
<build>

ale/src/gen/java/org/bytedeco/ale/ALEInterface.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.ale;
44

55
import java.nio.*;
66
import org.bytedeco.javacpp.*;
77
import org.bytedeco.javacpp.annotation.*;
88

9+
import static org.bytedeco.javacpp.presets.javacpp.*;
10+
911
import static org.bytedeco.ale.global.ale.*;
1012

1113

ale/src/gen/java/org/bytedeco/ale/ALERAM.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.ale;
44

55
import java.nio.*;
66
import org.bytedeco.javacpp.*;
77
import org.bytedeco.javacpp.annotation.*;
88

9+
import static org.bytedeco.javacpp.presets.javacpp.*;
10+
911
import static org.bytedeco.ale.global.ale.*;
1012

1113

ale/src/gen/java/org/bytedeco/ale/ALEScreen.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.ale;
44

55
import java.nio.*;
66
import org.bytedeco.javacpp.*;
77
import org.bytedeco.javacpp.annotation.*;
88

9+
import static org.bytedeco.javacpp.presets.javacpp.*;
10+
911
import static org.bytedeco.ale.global.ale.*;
1012

1113

ale/src/gen/java/org/bytedeco/ale/ALEState.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.ale;
44

55
import java.nio.*;
66
import org.bytedeco.javacpp.*;
77
import org.bytedeco.javacpp.annotation.*;
88

9+
import static org.bytedeco.javacpp.presets.javacpp.*;
10+
911
import static org.bytedeco.ale.global.ale.*;
1012

1113

ale/src/gen/java/org/bytedeco/ale/Cartridge.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.ale;
44

55
import java.nio.*;
66
import org.bytedeco.javacpp.*;
77
import org.bytedeco.javacpp.annotation.*;
88

9+
import static org.bytedeco.javacpp.presets.javacpp.*;
10+
911
import static org.bytedeco.ale.global.ale.*;
1012

1113

@@ -89,7 +91,7 @@ Save the internal (patched) ROM image.
8991
@param value The value to place into the address
9092
@return Success or failure of the patch operation
9193
*/
92-
public native @Cast("bool") boolean patch(@Cast("uInt16") short address, @Cast("uInt8") byte value);
94+
public native @Cast("bool") boolean patch(@Cast("uInt16") short _address, @Cast("uInt8") byte value);
9395

9496
/**
9597
Access the internal ROM image for this cartridge.

ale/src/gen/java/org/bytedeco/ale/ColourPalette.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.ale;
44

55
import java.nio.*;
66
import org.bytedeco.javacpp.*;
77
import org.bytedeco.javacpp.annotation.*;
88

9+
import static org.bytedeco.javacpp.presets.javacpp.*;
10+
911
import static org.bytedeco.ale.global.ale.*;
1012

1113

ale/src/gen/java/org/bytedeco/ale/Console.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.ale;
44

55
import java.nio.*;
66
import org.bytedeco.javacpp.*;
77
import org.bytedeco.javacpp.annotation.*;
88

9+
import static org.bytedeco.javacpp.presets.javacpp.*;
10+
911
import static org.bytedeco.ale.global.ale.*;
1012

1113

ale/src/gen/java/org/bytedeco/ale/Controller.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.ale;
44

55
import java.nio.*;
66
import org.bytedeco.javacpp.*;
77
import org.bytedeco.javacpp.annotation.*;
88

9+
import static org.bytedeco.javacpp.presets.javacpp.*;
10+
911
import static org.bytedeco.ale.global.ale.*;
1012

1113

ale/src/gen/java/org/bytedeco/ale/Deserializer.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.ale;
44

55
import java.nio.*;
66
import org.bytedeco.javacpp.*;
77
import org.bytedeco.javacpp.annotation.*;
88

9+
import static org.bytedeco.javacpp.presets.javacpp.*;
10+
911
import static org.bytedeco.ale.global.ale.*;
1012

1113
@Opaque @Properties(inherit = org.bytedeco.ale.presets.ale.class)

ale/src/gen/java/org/bytedeco/ale/Device.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
1+
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE
22

33
package org.bytedeco.ale;
44

55
import java.nio.*;
66
import org.bytedeco.javacpp.*;
77
import org.bytedeco.javacpp.annotation.*;
88

9+
import static org.bytedeco.javacpp.presets.javacpp.*;
10+
911
import static org.bytedeco.ale.global.ale.*;
1012

1113

@@ -76,13 +78,13 @@ public class Device extends Pointer {
7678
<p>
7779
@return The byte at the specified address
7880
*/
79-
public native @Cast("uInt8") byte peek(@Cast("uInt16") short address);
81+
public native @Cast("uInt8") byte peek(@Cast("uInt16") short _address);
8082

8183
/**
8284
Change the byte at the specified address to the given value
8385
<p>
8486
@param address The address where the value should be stored
8587
@param value The value to be stored at the address
8688
*/
87-
public native void poke(@Cast("uInt16") short address, @Cast("uInt8") byte value);
89+
public native void poke(@Cast("uInt16") short _address, @Cast("uInt8") byte value);
8890
}

0 commit comments

Comments
 (0)