Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/easyinnova/Tiff-Library-4J…
Browse files Browse the repository at this point in the history 
… into develop
  • Loading branch information
@victormunoz
victormunoz committed May 24, 2017
2 parents 63b6fec + cbb2684 commit c9ea7d9
Show file tree
Hide file tree
Showing 33 changed files with 339 additions and 224 deletions.
352 changes: 190 additions & 162 deletions pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,167 +1,195 @@
<?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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.easyinnova</groupId>
<artifactId>tifflibrary4java</artifactId>
<version>1.8.7</version>
<packaging>jar</packaging>
<name>Tiff Library 4 Java</name>
<description>A library to read and give access to Tiff files.</description>
<url>https://github.com/easyinnova/Tiff-Library-4J/</url>
<inceptionYear>2015</inceptionYear>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<licenses>
<license>
<name>GNU General Public License, Version 3.0</name>
<url>https://www.gnu.org/licenses/gpl.txt</url>
<distribution>repo</distribution>
</license>
<license>
<name>Mozilla Public License, Version 2.0</name>
<url>https://www.mozilla.org/MPL/2.0</url>
<distribution>repo</distribution>
</license>
</licenses>
<dependencies>
<!--<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3.1</version>
</dependency>-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
<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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.easyinnova</groupId>
<artifactId>tifflibrary4java</artifactId>
<version>1.8.7</version>
<packaging>jar</packaging>
<name>Tiff Library 4 Java</name>
<description>A library to read and give access to Tiff files.</description>
<url>https://github.com/easyinnova/Tiff-Library-4J/</url>
<inceptionYear>2015</inceptionYear>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
<licenses>
<license>
<name>GNU General Public License, Version 3.0</name>
<url>https://www.gnu.org/licenses/gpl.txt</url>
<distribution>repo</distribution>
</license>
<license>
<name>Mozilla Public License, Version 2.0</name>
<url>https://www.mozilla.org/MPL/2.0</url>
<distribution>repo</distribution>
</license>
</licenses>
<dependencies>
<!--<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3.1</version>
</dependency>-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit-dep</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/com.adobe.xmp/xmpcore -->
<dependency>
<groupId>com.adobe.xmp</groupId>
<artifactId>xmpcore</artifactId>
<version>5.1.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.adobe.xmp/xmpcore -->
<dependency>
<groupId>com.adobe.xmp</groupId>
<artifactId>xmpcore</artifactId>
<version>5.1.2</version>
</dependency>

<!-- https://github.com/vnesek/nmote-iim4j -->
<dependency>
<groupId>com.nmote.iim4j</groupId>
<artifactId>nmote-iim4j</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
<developers>
<developer>
<name>Víctor Muñoz Solà</name>
<email>victormunoz@easyinnova.com</email>
<organization>Easy Innova</organization>
<organizationUrl>http://www.easyinnova.com</organizationUrl>
</developer>
</developers>
<scm>
<connection>scm:git:git@github.com:easyinnova/Tiff-Library-4J.git</connection>
<developerConnection>scm:git:git@github.com:easyinnova/Tiff-Library-4J.git</developerConnection>
<url>git@github.com:easyinnova/Tiff-Library-4J.git</url>
</scm>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version>
</plugin>
</plugins>
</pluginManagement>
<!-- https://github.com/vnesek/nmote-iim4j -->
<dependency>
<groupId>com.nmote.iim4j</groupId>
<artifactId>nmote-iim4j</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
<developers>
<developer>
<name>Víctor Muñoz Solà</name>
<email>victormunoz@easyinnova.com</email>
<organization>Easy Innova</organization>
<organizationUrl>http://www.easyinnova.com</organizationUrl>
</developer>
</developers>
<scm>
<connection>scm:git:git@github.com:easyinnova/Tiff-Library-4J.git</connection>
<developerConnection>scm:git:git@github.com:easyinnova/Tiff-Library-4J.git
</developerConnection>
<url>git@github.com:easyinnova/Tiff-Library-4J.git</url>
</scm>
<distributionManagement>
<snapshotRepository>
<id>ossrh</id>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository>
<repository>
<id>ossrh</id>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>

<build>

<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version>
</plugin>
</plugins>
</pluginManagement>

<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>

<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>

<profiles>

<!-- Sign + JavaDoc-->
<profile>
<id>no-local</id>
<activation>
<property>
<name>!local</name>
</property>
</activation>
<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<stylesheetfile>${basedir}/stylesheet.css</stylesheetfile>
<docfilessubdirs>true</docfilessubdirs>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
</links>
<sourcepath>${basedir}/src</sourcepath>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
</profile>
</profiles>

<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.3</version>
<extensions>true</extensions>
<configuration>
<serverId>ossrh</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<stylesheetfile>${basedir}/stylesheet.css</stylesheetfile>
<docfilessubdirs>true</docfilessubdirs>
<links>
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
</links>
<sourcepath>${basedir}/src</sourcepath>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
2 changes: 1 addition & 1 deletion src/main/java/com/easyinnova/tiff/io/OutputBuffer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteOrder;
import com.easyinnova.tiff.model.ByteOrder;

/**
* The Class OutputBuffer.
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/easyinnova/tiff/io/TiffInputStream.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
*/
package com.easyinnova.tiff.io;

import com.easyinnova.tiff.model.ByteOrder;
import com.easyinnova.tiff.model.types.Ascii;
import com.easyinnova.tiff.model.types.Byte;
import com.easyinnova.tiff.model.types.Double;
Expand All @@ -48,8 +49,6 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.ByteOrder;
import java.nio.MappedByteBuffer;

/**
* The Class TiffInputStream.
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/easyinnova/tiff/io/TiffOutputStream.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.ByteOrder;
import com.easyinnova.tiff.model.ByteOrder;

/**
* The Class TiffOutputStream.
Expand Down
Loading

0 comments on commit c9ea7d9

Please sign in to comment.