[Geotools-commits] svn - r34737 - in branches/2.5.x/modules: library/coverage/src/main/java/org/geotools/coverage/grid/io/imageio/geotiff plugin/geotiff/src/main/java/org/geotools/gce/geotiff/adapters

[<svn...@os...>]

Author: danieleromagnoli
Date: 2009-12-23 08:14:37 -0500 (Wed, 23 Dec 2009)
New Revision: 34737

Modified:
   branches/2.5.x/modules/library/coverage/src/main/java/org/geotools/coverage/grid/io/imageio/geotiff/GeoKeyEntry.java
   branches/2.5.x/modules/library/coverage/src/main/java/org/geotools/coverage/grid/io/imageio/geotiff/GeoTiffIIOMetadataEncoder.java
   branches/2.5.x/modules/plugin/geotiff/src/main/java/org/geotools/gce/geotiff/adapters/GeoKeyEntry.java
   branches/2.5.x/modules/plugin/geotiff/src/main/java/org/geotools/gce/geotiff/adapters/GeoTiffIIOMetadataEncoder.java
Log:
GEOT-2899 on 2.5.x

Modified: branches/2.5.x/modules/library/coverage/src/main/java/org/geotools/coverage/grid/io/imageio/geotiff/GeoKeyEntry.java
===================================================================
--- branches/2.5.x/modules/library/coverage/src/main/java/org/geotools/coverage/grid/io/imageio/geotiff/GeoKeyEntry.java	2009-12-23 13:14:06 UTC (rev 34736)
+++ branches/2.5.x/modules/library/coverage/src/main/java/org/geotools/coverage/grid/io/imageio/geotiff/GeoKeyEntry.java	2009-12-23 13:14:37 UTC (rev 34737)
@@ -160,12 +160,12 @@
 	}
 
 	public void setValueOffset(int valueOffset) {
-		ensureNotNegative("ALUE_OFFSET", valueOffset);
+		ensureNotNegative("VALUE_OFFSET", valueOffset);
 		this.valueOffset = valueOffset;
 	}
 
 	public int[] getValues() {
-		return new int[] { keyID, tiffTagLocation, valueOffset, count };
+		return new int[] { keyID, tiffTagLocation, count, valueOffset };
 	}
 
 	/**

Modified: branches/2.5.x/modules/library/coverage/src/main/java/org/geotools/coverage/grid/io/imageio/geotiff/GeoTiffIIOMetadataEncoder.java
===================================================================
--- branches/2.5.x/modules/library/coverage/src/main/java/org/geotools/coverage/grid/io/imageio/geotiff/GeoTiffIIOMetadataEncoder.java	2009-12-23 13:14:06 UTC (rev 34736)
+++ branches/2.5.x/modules/library/coverage/src/main/java/org/geotools/coverage/grid/io/imageio/geotiff/GeoTiffIIOMetadataEncoder.java	2009-12-23 13:14:37 UTC (rev 34737)
@@ -296,7 +296,7 @@
 
 		final int numKeyEntries = numGeoTiffEntries;
 		geoTiffEntries.add(new Integer(keyID), new GeoKeyEntry(keyID, tag,
-				offset, count));
+				count, offset));
 		getGeoKeyEntryAt(0).setCount(numKeyEntries);
 		numGeoTiffEntries++;
 	}

Modified: branches/2.5.x/modules/plugin/geotiff/src/main/java/org/geotools/gce/geotiff/adapters/GeoKeyEntry.java
===================================================================
--- branches/2.5.x/modules/plugin/geotiff/src/main/java/org/geotools/gce/geotiff/adapters/GeoKeyEntry.java	2009-12-23 13:14:06 UTC (rev 34736)
+++ branches/2.5.x/modules/plugin/geotiff/src/main/java/org/geotools/gce/geotiff/adapters/GeoKeyEntry.java	2009-12-23 13:14:37 UTC (rev 34737)
@@ -160,12 +160,12 @@
 	}
 
 	public void setValueOffset(int valueOffset) {
-		ensureNotNegative("ALUE_OFFSET", valueOffset);
+		ensureNotNegative("VALUE_OFFSET", valueOffset);
 		this.valueOffset = valueOffset;
 	}
 
 	public int[] getValues() {
-		return new int[] { keyID, tiffTagLocation, valueOffset, count };
+		return new int[] { keyID, tiffTagLocation, count, valueOffset};
 	}
 
 	/**

Modified: branches/2.5.x/modules/plugin/geotiff/src/main/java/org/geotools/gce/geotiff/adapters/GeoTiffIIOMetadataEncoder.java
===================================================================
--- branches/2.5.x/modules/plugin/geotiff/src/main/java/org/geotools/gce/geotiff/adapters/GeoTiffIIOMetadataEncoder.java	2009-12-23 13:14:06 UTC (rev 34736)
+++ branches/2.5.x/modules/plugin/geotiff/src/main/java/org/geotools/gce/geotiff/adapters/GeoTiffIIOMetadataEncoder.java	2009-12-23 13:14:37 UTC (rev 34737)
@@ -296,7 +296,7 @@
 
 		final int numKeyEntries = numGeoTiffEntries;
 		geoTiffEntries.add(new Integer(keyID), new GeoKeyEntry(keyID, tag,
-				offset, count));
+				count, offset));
 		getGeoKeyEntryAt(0).setCount(numKeyEntries);
 		numGeoTiffEntries++;
 	}