Fixes a bug in the TEXfile class that caused a NullpointerException w…

…hen opening Tex-textures.
Dahie · Feb 9, 2012 · 1112d49 · 1112d49
1 parent 5e1a202
commit 1112d49
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/DDSUtils/src/model/AbstractTextureImage.java b/DDSUtils/src/model/AbstractTextureImage.java
@@ -161,7 +161,7 @@ public void write() throws IOException {
 	 */
 	@Override
 	public boolean isCompressed() {
-		return DDSUtil.isDXTCompressed(pixelformat);
+		return PixelFormats.isDXTCompressed(pixelformat);
 	}
 
 	/**

diff --git a/DDSUtils/src/model/MipMaps.java b/DDSUtils/src/model/MipMaps.java
@@ -57,13 +57,13 @@ public MipMaps(final int numMipMaps) {
 	 * @param topmost 
 	 */
 	public void generateMipMaps(BufferedImage topmost) {
-		this.mipmaps.add(topmost);
+		getMipMaps().add(topmost);
 
 		if(!DDSFile.isPowerOfTwo(topmost.getWidth()) 
 				&& !DDSFile.isPowerOfTwo(topmost.getHeight())) 
 			throw new NonCubicDimensionException();
 
-		this.mipmaps = generateMipMapArray(this.mipmaps);	
+		this.mipmaps = generateMipMapArray(getMipMaps());	
 	}
 
 	private Vector<BufferedImage> generateMipMapArray(Vector<BufferedImage> mipMapsVector) {
@@ -122,23 +122,30 @@ public int getWidth() {
 	 * @return
 	 */
 	public BufferedImage getMipMap(final int index) {
-		return this.mipmaps.get(index);
+		return getMipMaps().get(index);
 	}
 
 	/**
 	 * Set the given {@link BufferedImage} as MipMap in the index.
-	 * @param mipmap
+	 * @param mipmapIndex
 	 * @param image
 	 */
-	public void setMipMap(int mipmap, BufferedImage image) {
+	public void setMipMap(int mipmapIndex, BufferedImage image) {
-		this.mipmaps.set(mipmap, image);
+		if(getMipMaps().size() == mipmapIndex)
+			getMipMaps().add(mipmapIndex, image);
+		else
+			getMipMaps().set(mipmapIndex, image);
+	}
+
+	private Vector<BufferedImage> getMipMaps() {
+		return this.mipmaps;
 	}
 
 	/**
 	 * @param image
 	 */
 	public void addMipMap(final BufferedImage image) {
-		this.mipmaps.add(image);
+		getMipMaps().add(image);
 	}
 
 	/**
@@ -163,15 +170,15 @@ public ByteBuffer[] getDXTCompressedBuffer(final Squish.CompressionType compress
 	 * @return
 	 */
 	public Vector<BufferedImage> getAllMipMaps() {
-		return this.mipmaps;
+		return getMipMaps();
 	}
 
 	/**
 	 * Returns an Array of {@link BufferedImage}s of MipMaps.
 	 * @return
 	 */
 	public BufferedImage[] getAllMipMapsArray() {
-		return (BufferedImage[]) this.mipmaps.toArray();
+		return (BufferedImage[]) getMipMaps().toArray();
 	}
 
 	/* (non-Javadoc)

diff --git a/DDSUtils/src/model/TEXFile.java b/DDSUtils/src/model/TEXFile.java
@@ -58,6 +58,7 @@ protected void init(final TEXImage image) {
 		this.depth 			= image.getDepth();
 		this.pixelformat 	= image.getPixelFormat();
 		this.numMipMaps 	= image.getNumMipMaps();
+		this.mipMaps 		= new MipMaps(this.numMipMaps);
 		this.hasMipMaps		= (image.getNumMipMaps() > 1); // there is always at least the topmost MipMap
 	}