Skip to content

Commit

Permalink
Release version 1.5.3
Browse files Browse the repository at this point in the history
  • Loading branch information
saudet committed Apr 14, 2020
1 parent 288cc6c commit ba4c7a2
Show file tree
Hide file tree
Showing 6,903 changed files with 17,483 additions and 7,954 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
8 changes: 4 additions & 4 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cache:

environment:
matrix:
- PROJ: "opencv,artoolkitplus,chilitags,flandmark"
- PROJ: "opencv,artoolkitplus,chilitags,flandmark,gym"
OS: windows-x86
- PROJ: "ffmpeg"
OS: windows-x86
Expand All @@ -22,7 +22,7 @@ environment:
OS: windows-x86
- PROJ: "arpack-ng,cminpack,fftw,gsl"
OS: windows-x86
- PROJ: "cpython,numpy,scipy,gym"
- PROJ: "cpython,numpy,scipy"
OS: windows-x86
- PROJ: "llvm"
OS: windows-x86
Expand All @@ -35,7 +35,7 @@ environment:
- PROJ: "cpu_features,systems"
OS: windows-x86

- PROJ: "opencv,artoolkitplus,chilitags,flandmark"
- PROJ: "opencv,artoolkitplus,chilitags,flandmark,gym"
OS: windows-x86_64
- PROJ: "ffmpeg"
OS: windows-x86_64
Expand All @@ -55,7 +55,7 @@ environment:
OS: windows-x86_64
- PROJ: "arpack-ng,cminpack,fftw,gsl"
OS: windows-x86_64
- PROJ: "cpython,numpy,scipy,gym"
- PROJ: "cpython,numpy,scipy"
OS: windows-x86_64
- PROJ: "llvm"
OS: windows-x86_64
Expand Down
12 changes: 6 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ matrix:
script: ./ci/install-ppc.sh

- os: linux
env: PROJ=opencv,artoolkitplus,chilitags,flandmark OS=linux-x86
env: PROJ=opencv,artoolkitplus,chilitags,flandmark,gym OS=linux-x86
install: true
script: ./ci/install-travis.sh
- os: linux
Expand Down Expand Up @@ -316,7 +316,7 @@ matrix:
install: true
script: ./ci/install-travis.sh
- os: linux
env: PROJ=cpython,numpy,scipy,gym OS=linux-x86
env: PROJ=cpython,numpy,scipy OS=linux-x86
install: true
script: ./ci/install-travis.sh
- os: linux
Expand Down Expand Up @@ -357,7 +357,7 @@ matrix:
script: ./ci/install-travis.sh

- os: linux
env: PROJ=opencv,artoolkitplus,chilitags,flandmark OS=linux-x86_64
env: PROJ=opencv,artoolkitplus,chilitags,flandmark,gym OS=linux-x86_64
install: true
script: ./ci/install-travis.sh
- os: linux
Expand Down Expand Up @@ -397,7 +397,7 @@ matrix:
install: true
script: ./ci/install-travis.sh
- os: linux
env: PROJ=cpython,numpy,scipy,gym OS=linux-x86_64
env: PROJ=cpython,numpy,scipy OS=linux-x86_64
install: true
script: ./ci/install-travis.sh
- os: linux
Expand Down Expand Up @@ -467,7 +467,7 @@ matrix:

- os: osx
osx_image: xcode9.3
env: PROJ=opencv,artoolkitplus,chilitags,flandmark OS=macosx-x86_64
env: PROJ=opencv,artoolkitplus,chilitags,flandmark,gym OS=macosx-x86_64
install: true
script: ./ci/install-travis.sh
- os: osx
Expand Down Expand Up @@ -517,7 +517,7 @@ matrix:
script: ./ci/install-travis.sh
- os: osx
osx_image: xcode9.3
env: PROJ=cpython,numpy,scipy,gym OS=macosx-x86_64
env: PROJ=cpython,numpy,scipy OS=macosx-x86_64
install: true
script: ./ci/install-travis.sh
- os: osx
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@

### April 14, 2020 version 1.5.3
* Add presets for the new `intensity_transform` and `rapid` modules of OpenCV
* Add support for Polly optimizer to presets for LLVM ([pull #864](https://github.com/bytedeco/javacpp-presets/pull/864))
* Fix loading issue with `opencv_dnn_superres` ([issue bytedeco/javacv#1396](https://github.com/bytedeco/javacv/issues/1396))
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@ We can also have everything downloaded and installed automatically with:
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>${moduleName}-platform</artifactId>
<version>${moduleVersion}-1.5.2</version>
<version>${moduleVersion}-1.5.3</version>
</dependency>
```

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

* Leiningen (inside the `project.clj` file)
```clojure
:dependencies [
[~(symbol (str "org.bytedeco/" moduleName "-platform")) ~(str moduleVersion "-1.5.2")]
[~(symbol (str "org.bytedeco/" moduleName "-platform")) ~(str moduleVersion "-1.5.3")]
]
```

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

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).
Expand Down Expand Up @@ -102,7 +102,7 @@ Additionally, one can find on the wiki page additional information about the rec
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:

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

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:

Expand All @@ -123,8 +123,8 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* HDF5 1.12.0 https://www.hdfgroup.org/downloads/
* Hyperscan 5.2.x https://github.com/intel/hyperscan
* MKL 2020.x https://software.intel.com/intel-mkl
* MKL-DNN 0.21.x https://github.com/intel/mkl-dnn
* DNNL 1.3.x https://github.com/intel/mkl-dnn
* MKL-DNN 0.21.x https://github.com/oneapi-src/oneDNN
* DNNL 1.3.x https://github.com/oneapi-src/oneDNN
* OpenBLAS 0.3.9 http://www.openblas.net/
* ARPACK-NG 3.7.0 https://github.com/opencollab/arpack-ng
* CMINPACK 1.3.6 https://github.com/devernay/cminpack
Expand All @@ -134,7 +134,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
* NumPy 1.18.x https://github.com/numpy/numpy
* SciPy 1.4.x https://github.com/scipy/scipy
* Gym 0.17.x https://github.com/openai/gym
* LLVM 9.0.x http://llvm.org/releases/download.html
* LLVM 10.0.x http://llvm.org/releases/download.html
* libpostal 1.1-alpha https://github.com/openvenues/libpostal
* Leptonica 1.79.0 http://www.leptonica.org/download.html
* Tesseract 4.1.1 https://github.com/tesseract-ocr/tesseract
Expand Down
4 changes: 2 additions & 2 deletions ale/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
<modelVersion>4.0.0</modelVersion>
<groupId>org.bytedeco.ale</groupId>
<artifactId>sharedlibraryinterfaceexample</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.3</version>
<properties>
<exec.mainClass>SharedLibraryInterfaceExample</exec.mainClass>
</properties>
<dependencies>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ale-platform</artifactId>
<version>0.6.1-1.5.3-SNAPSHOT</version>
<version>0.6.1-1.5.3</version>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion ale/platform/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.bytedeco</groupId>
<artifactId>javacpp-presets</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.3</version>
<relativePath>../../</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion ale/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.bytedeco</groupId>
<artifactId>javacpp-presets</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.3</version>
</parent>

<groupId>org.bytedeco</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ale/samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.bytedeco.ale</groupId>
<artifactId>sharedlibraryinterfaceexample</artifactId>
<version>1.5.3-SNAPSHOT</version>
<version>1.5.3</version>
<properties>
<exec.mainClass>SharedLibraryInterfaceExample</exec.mainClass>
</properties>
<dependencies>
<dependency>
<groupId>org.bytedeco</groupId>
<artifactId>ale-platform</artifactId>
<version>0.6.1-1.5.3-SNAPSHOT</version>
<version>0.6.1-1.5.3</version>
</dependency>
</dependencies>
<build>
Expand Down
4 changes: 3 additions & 1 deletion ale/src/gen/java/org/bytedeco/ale/ALEInterface.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE

package org.bytedeco.ale;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;

import static org.bytedeco.ale.global.ale.*;


Expand Down
4 changes: 3 additions & 1 deletion ale/src/gen/java/org/bytedeco/ale/ALERAM.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE

package org.bytedeco.ale;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;

import static org.bytedeco.ale.global.ale.*;


Expand Down
4 changes: 3 additions & 1 deletion ale/src/gen/java/org/bytedeco/ale/ALEScreen.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE

package org.bytedeco.ale;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;

import static org.bytedeco.ale.global.ale.*;


Expand Down
4 changes: 3 additions & 1 deletion ale/src/gen/java/org/bytedeco/ale/ALEState.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE

package org.bytedeco.ale;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;

import static org.bytedeco.ale.global.ale.*;


Expand Down
6 changes: 4 additions & 2 deletions ale/src/gen/java/org/bytedeco/ale/Cartridge.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE

package org.bytedeco.ale;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;

import static org.bytedeco.ale.global.ale.*;


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

/**
Access the internal ROM image for this cartridge.
Expand Down
4 changes: 3 additions & 1 deletion ale/src/gen/java/org/bytedeco/ale/ColourPalette.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE

package org.bytedeco.ale;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;

import static org.bytedeco.ale.global.ale.*;


Expand Down
4 changes: 3 additions & 1 deletion ale/src/gen/java/org/bytedeco/ale/Console.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE

package org.bytedeco.ale;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;

import static org.bytedeco.ale.global.ale.*;


Expand Down
4 changes: 3 additions & 1 deletion ale/src/gen/java/org/bytedeco/ale/Controller.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE

package org.bytedeco.ale;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;

import static org.bytedeco.ale.global.ale.*;


Expand Down
4 changes: 3 additions & 1 deletion ale/src/gen/java/org/bytedeco/ale/Deserializer.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE

package org.bytedeco.ale;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;

import static org.bytedeco.ale.global.ale.*;

@Opaque @Properties(inherit = org.bytedeco.ale.presets.ale.class)
Expand Down
8 changes: 5 additions & 3 deletions ale/src/gen/java/org/bytedeco/ale/Device.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
// Targeted by JavaCPP version 1.5.3-SNAPSHOT: DO NOT EDIT THIS FILE
// Targeted by JavaCPP version 1.5.3: DO NOT EDIT THIS FILE

package org.bytedeco.ale;

import java.nio.*;
import org.bytedeco.javacpp.*;
import org.bytedeco.javacpp.annotation.*;

import static org.bytedeco.javacpp.presets.javacpp.*;

import static org.bytedeco.ale.global.ale.*;


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

/**
Change the byte at the specified address to the given value
<p>
@param address The address where the value should be stored
@param value The value to be stored at the address
*/
public native void poke(@Cast("uInt16") short address, @Cast("uInt8") byte value);
public native void poke(@Cast("uInt16") short _address, @Cast("uInt8") byte value);
}
Loading

0 comments on commit ba4c7a2

Please sign in to comment.