Skip to content

Commit

Permalink
Upgrade to Leptonica 1.79.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@nguyenq
nguyenq committed Jan 3, 2020
1 parent 23940dc commit 91e61ad
Show file tree
Hide file tree
Showing 14 changed files with 105,533 additions and 105,451 deletions.
228 changes: 114 additions & 114 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,114 +1,114 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.lept4j</groupId>
<artifactId>lept4j</artifactId>
<version>1.12.4-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<name>Lept4J - Leptonica for Java</name>
<url>https://github.com/nguyenq/lept4j</url>

<description>
# Lept4J

## Description:

A Java JNA wrapper for Leptonica Image Processing library.

Lept4J is released and distributed under the Apache License, v2.0.
</description>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
</parent>

<licenses>
<license>
<name>Apache License 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<connection>scm:svn:https://github.com/nguyenq/lept4j/trunk</connection>
<developerConnection>scm:svn:https://github.com/nguyenq/lept4j/trunk</developerConnection>
<url>https://github.com/nguyenq/lept4j/trunk</url>
</scm>

<developers>
<developer>
<name>Quan Nguyen</name>
<email>nguyenq@users.sf.net</email>
</developer>
</developers>

<contributors>
<contributor>
<name>O.J. Sousa Rodrigues</name>
<email>osoriojaques@gmail.com</email>
<roles>
<role>developer</role>
<role>contributor</role>
</roles>
<timezone>+1</timezone>
</contributor>
</contributors>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<debug>false</debug>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<detectJavaApiLink>false</detectJavaApiLink>
<offlineLinks>
<offlineLink>
<url>https://docs.oracle.com/en/java/javase/12/docs/api/</url>
</offlineLink>
</offlineLinks>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.5.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>com.github.jai-imageio</groupId>
<artifactId>jai-imageio-core</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.lept4j</groupId>
<artifactId>lept4j</artifactId>
<version>1.13.0-SNAPSHOT</version>
<packaging>jar</packaging>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>

<name>Lept4J - Leptonica for Java</name>
<url>https://github.com/nguyenq/lept4j</url>

<description>
# Lept4J

## Description:

A Java JNA wrapper for Leptonica Image Processing library.

Lept4J is released and distributed under the Apache License, v2.0.
</description>

<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>9</version>
</parent>

<licenses>
<license>
<name>Apache License 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
<distribution>repo</distribution>
</license>
</licenses>

<scm>
<connection>scm:svn:https://github.com/nguyenq/lept4j/trunk</connection>
<developerConnection>scm:svn:https://github.com/nguyenq/lept4j/trunk</developerConnection>
<url>https://github.com/nguyenq/lept4j/trunk</url>
</scm>

<developers>
<developer>
<name>Quan Nguyen</name>
<email>nguyenq@users.sf.net</email>
</developer>
</developers>

<contributors>
<contributor>
<name>O.J. Sousa Rodrigues</name>
<email>osoriojaques@gmail.com</email>
<roles>
<role>developer</role>
<role>contributor</role>
</roles>
<timezone>+1</timezone>
</contributor>
</contributors>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.5.1</version>
<configuration>
<debug>false</debug>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<detectJavaApiLink>false</detectJavaApiLink>
<offlineLinks>
<offlineLink>
<url>https://docs.oracle.com/en/java/javase/12/docs/api/</url>
</offlineLink>
</offlineLinks>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.java.dev.jna</groupId>
<artifactId>jna</artifactId>
<version>5.5.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.6</version>
</dependency>
<dependency>
<groupId>com.github.jai-imageio</groupId>
<artifactId>jai-imageio-core</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
8 changes: 4 additions & 4 deletions src/main/java/net/sourceforge/lept4j/GPlot.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.List;
/**
* Data structure for generating gnuplot files<br>
* <i>native declaration : gplot.h:43</i><br>
* <i>native declaration : gplot.h:50</i><br>
* This file was autogenerated by <a href="http://jnaerator.googlecode.com/">JNAerator</a>,<br>
* a tool written by <a href="http://ochafik.com/">Olivier Chafik</a> that <a href="http://code.google.com/p/jnaerator/wiki/CreditsAndLicense">uses a few opensource projects.</a>.<br>
* For help, please visit <a href="http://nativelibs4java.googlecode.com/">NativeLibs4Java</a> or <a href="http://jna.dev.java.net/">JNA</a>.
Expand Down Expand Up @@ -37,10 +37,10 @@ public class GPlot extends Structure {
*/
public net.sourceforge.lept4j.Sarray.ByReference plotdata;
/**
* title for each individual plot<br>
* label for each individual plot<br>
* C type : Sarray*
*/
public net.sourceforge.lept4j.Sarray.ByReference plottitles;
public net.sourceforge.lept4j.Sarray.ByReference plotlabels;
/**
* plot style for individual plots<br>
* C type : Numa*
Expand Down Expand Up @@ -90,7 +90,7 @@ public GPlot() {
*/
@Override
protected List<String> getFieldOrder() {
return Arrays.asList("rootname", "cmdname", "cmddata", "datanames", "plotdata", "plottitles", "plotstyles", "nplots", "outname", "outformat", "scaling", "title", "xlabel", "ylabel");
return Arrays.asList("rootname", "cmdname", "cmddata", "datanames", "plotdata", "plotlabels", "plotstyles", "nplots", "outname", "outformat", "scaling", "title", "xlabel", "ylabel");
}
public GPlot(Pointer peer) {
super(peer);
Expand Down
25 changes: 22 additions & 3 deletions src/main/java/net/sourceforge/lept4j/ILeptonica.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ public static interface GPLOT_OUTPUT {
/** <i>native declaration : gplot.h:23</i>
*/
public static final int GPLOT_LATEX = 4;
/** <i>native declaration : gplot.h:24</i> */
public static final int GPLOT_PNM = 5;
};

/**
Expand Down Expand Up @@ -1038,6 +1040,14 @@ public static interface GPLOT_SCALING {
* only remove smaller
*/
public static final int L_REMOVE_SMALL = 2;
/** use union of two boxes */
public static final int L_GEOMETRIC_UNION = 1;
/** use intersection of two boxes */
public static final int L_GEOMETRIC_INTERSECTION = 2;
/** use box with largest area */
public static final int L_LARGEST_AREA = 3;
/** use box with smallest area */
public static final int L_SMALLEST_AREA = 4;
/**
* consider all boxes in the sequence
*/
Expand All @@ -1054,6 +1064,8 @@ public static interface GPLOT_SCALING {
public static final int L_LOWER_LEFT = 3;
/** LR corner */
public static final int L_LOWER_RIGHT = 4;
/** center */
public static final int L_BOX_CENTER = 5;
/**
* increasing stretch or contraction to left
*/
Expand Down Expand Up @@ -1363,7 +1375,7 @@ public static interface GPLOT_SCALING {
public static final int LIBLEPT_MAJOR_VERSION = (int) 1;
/** <i>native declaration : allheaders.h</i>
*/
public static final int LIBLEPT_MINOR_VERSION = (int) 78;
public static final int LIBLEPT_MINOR_VERSION = (int) 79;
/** <i>native declaration : allheaders.h</i>
*/
public static final int LIBLEPT_PATCH_VERSION = (int) 0;
Expand All @@ -1388,6 +1400,8 @@ public static interface GPLOT_SCALING {
/** <i>native declaration : environ.h</i>
*/
public static final int HAVE_LIBWEBP = (int) 1;
/** <i>native declaration : environ.h</i> */
public static final int HAVE_LIBWEBP_ANIM = (int) 0;
/** <i>native declaration : environ.h</i>
*/
public static final int HAVE_LIBJP2K = (int) 1;
Expand Down Expand Up @@ -1444,7 +1458,7 @@ public static interface GPLOT_SCALING {
public static final int NUM_GPLOT_STYLES = (int) 5;
/** <i>native declaration : gplot.h</i>
*/
public static final int NUM_GPLOT_OUTPUTS = (int) 5;
public static final int NUM_GPLOT_OUTPUTS = (int) 6;
/** <i>native declaration : jbclass.h</i>
*/
public static final String JB_TEMPLATE_EXT = (String) ".templates.png";
Expand Down Expand Up @@ -1522,7 +1536,12 @@ public interface dealloc_fn extends Callback {

void apply(Pointer voidPtr1);
};


/** <i>native declaration : allheaders.h:5431</i> */
public interface leptSetStderrHandler_handler_callback extends Callback {
void apply(Pointer charPtr1);
};

public static class HBITMAP extends PointerType {

public HBITMAP(Pointer address) {
Expand Down
Loading

0 comments on commit 91e61ad

Please sign in to comment.