Merge pull request #20 from ngageoint/develop

release 2.0.0

.gitignore

@@ -1 +1,5 @@
 /target/
+
+# IntelliJ
+.idea
+*.iml

CHANGELOG.md

@@ -4,9 +4,15 @@ Adheres to [Semantic Versioning](http://semver.org/).
 
 ---
 
-## 1.0.4 (TBD)
-
-* TBD
+## [2.0.0](https://github.com/ngageoint/geopackage-tiff-java/releases/tag/2.0.0) (11-20-2017)
+
+* Rasters modified to use buffers in place of arrays
+* Deflate compression support
+* Additional Rasters constructor options
+* Handle missing samples per pixel with default value of 1
+* Public access to tiff tags
+* String Entry Value getter and setter
+* maven-gpg-plugin version 1.6
 
 ## [1.0.3](https://github.com/ngageoint/geopackage-tiff-java/releases/tag/1.0.3) (06-27-2017)
 

README.md

@@ -30,7 +30,7 @@ TIFFImage tiffImage = TiffReader.readTiff(input);
 List<FileDirectory> directories = tiffImage.getFileDirectories();
 FileDirectory directory = directories.get(0);
 Rasters rasters = directory.readRasters();
-        
+
 ```
 
 #### Write ####
@@ -76,12 +76,12 @@ TiffWriter.writeTiff(file, tiffImage);
 
 ### Installation ###
 
-Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga|tiff|1.0.3|jar) (JAR, POM, Source, Javadoc)
+Pull from the [Maven Central Repository](http://search.maven.org/#artifactdetails|mil.nga|tiff|2.0.0|jar) (JAR, POM, Source, Javadoc)
 
     <dependency>
         <groupId>mil.nga</groupId>
         <artifactId>tiff</artifactId>
-        <version>1.0.3</version>
+        <version>2.0.0</version>
     </dependency>
 
 ### Build ###

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>mil.nga</groupId>
 	<artifactId>tiff</artifactId>
-	<version>1.0.4</version>
+	<version>2.0.0</version>
 	<packaging>jar</packaging>
 	<name>Tagged Image File Format</name>
 	<url>https://github.com/ngageoint/geopackage-tiff-java</url>
@@ -84,6 +84,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-gpg-plugin</artifactId>
+				<version>1.6</version>
 				<executions>
 					<execution>
 						<id>sign-artifacts</id>

src/main/java/mil/nga/tiff/FieldType.java

@@ -1,5 +1,8 @@
 package mil.nga.tiff;
 
+import mil.nga.tiff.util.TiffConstants;
+import mil.nga.tiff.util.TiffException;
+
 /**
  * Field Types
  * 
@@ -104,6 +107,16 @@ public int getBytes() {
 		return bytes;
 	}
 
+	/**
+	 * Get the number of bits per value
+	 * 
+	 * @return number of bits
+	 * @since 2.0.0
+	 */
+	public int getBits() {
+		return bytes * 8;
+	}
+
 	/**
 	 * Get the field type
 	 * 
@@ -115,4 +128,101 @@ public static FieldType getFieldType(int fieldType) {
 		return FieldType.values()[fieldType - 1];
 	}
 
+	/**
+	 * Get the field type of the sample format and bits per sample
+	 * 
+	 * @param sampleFormat
+	 *            sample format
+	 * @param bitsPerSample
+	 *            bits per sample
+	 * @return field type
+	 * @since 2.0.0
+	 */
+	public static FieldType getFieldType(int sampleFormat, int bitsPerSample) {
+
+		FieldType fieldType = null;
+
+		switch (sampleFormat) {
+		case TiffConstants.SAMPLE_FORMAT_UNSIGNED_INT:
+			switch (bitsPerSample) {
+			case 8:
+				fieldType = FieldType.BYTE;
+				break;
+			case 16:
+				fieldType = FieldType.SHORT;
+				break;
+			case 32:
+				fieldType = FieldType.LONG;
+				break;
+			}
+			break;
+		case TiffConstants.SAMPLE_FORMAT_SIGNED_INT:
+			switch (bitsPerSample) {
+			case 8:
+				fieldType = FieldType.SBYTE;
+				break;
+			case 16:
+				fieldType = FieldType.SSHORT;
+				break;
+			case 32:
+				fieldType = FieldType.SLONG;
+				break;
+			}
+			break;
+		case TiffConstants.SAMPLE_FORMAT_FLOAT:
+			switch (bitsPerSample) {
+			case 32:
+				fieldType = FieldType.FLOAT;
+				break;
+			case 64:
+				fieldType = FieldType.DOUBLE;
+				break;
+			}
+			break;
+		}
+
+		if (fieldType == null) {
+			throw new TiffException(
+					"Unsupported field type for sample format: " + sampleFormat
+							+ ", bits per sample: " + bitsPerSample);
+		}
+
+		return fieldType;
+	}
+
+	/**
+	 * Get the sample format of the field type
+	 * 
+	 * @param fieldType
+	 *            field type
+	 * @return sample format
+	 * @since 2.0.0
+	 */
+	public static int getSampleFormat(FieldType fieldType) {
+
+		int sampleFormat;
+
+		switch (fieldType) {
+		case BYTE:
+		case SHORT:
+		case LONG:
+			sampleFormat = TiffConstants.SAMPLE_FORMAT_UNSIGNED_INT;
+			break;
+		case SBYTE:
+		case SSHORT:
+		case SLONG:
+			sampleFormat = TiffConstants.SAMPLE_FORMAT_SIGNED_INT;
+			break;
+		case FLOAT:
+		case DOUBLE:
+			sampleFormat = TiffConstants.SAMPLE_FORMAT_FLOAT;
+			break;
+		default:
+			throw new TiffException(
+					"Unsupported sample format for field type: " + fieldType);
+		}
+
+		return sampleFormat;
+	}
+
 }