fix up parsing of images from zip template packs. Closes #163

P3pp3rF1y · Nov 19, 2014 · 1d1f47e · 1d1f47e
1 parent 893e958
commit 1d1f47e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/project_resources/template/default_structure_pack/default_structure_pack.zip b/project_resources/template/default_structure_pack/default_structure_pack.zip
diff --git a/src/main/java/net/shadowmage/ancientwarfare/structure/template/load/TemplateLoader.java b/src/main/java/net/shadowmage/ancientwarfare/structure/template/load/TemplateLoader.java
@@ -168,7 +168,7 @@ private void loadStructureImage(String imageName, InputStream is)
   try
     {
     MessageDigest md = MessageDigest.getInstance("MD5");
-    DigestInputStream dis = new DigestInputStream(is, md);
+    DigestInputStream dis = new DigestInputStream(is, md);//InputStream is closed externally
     BufferedImage image = ImageIO.read(is);
     if(image!=null && image.getWidth()==AWStructureStatics.structureImageWidth && image.getHeight()==AWStructureStatics.structureImageHeight)
       {
@@ -187,7 +187,7 @@ private void loadStructureImage(String imageName, InputStream is)
       {
       AWLog.logError("Attempted to load improper sized template image: "+imageName+ " with dimensions of: "+image.getWidth()+"x"+image.getHeight()+".  Specified width/height is: "+AWStructureStatics.structureImageWidth+"x"+AWStructureStatics.structureImageHeight);
       }
-    dis.close();
+//    dis.close();
     } 
   catch (IOException e)
     {
@@ -352,7 +352,16 @@ else if(isProbableImage(currentFile))
       {
       try
         {
-        loadStructureImage(currentFile.getName(), new FileInputStream(currentFile));
+        FileInputStream fis = new FileInputStream(currentFile);
+        loadStructureImage(currentFile.getName(), fis);
+        try
+          {
+          fis.close();
+          }
+        catch (IOException e)
+          {
+          e.printStackTrace();
+          }
         } 
       catch (FileNotFoundException e)
         {

diff --git a/src/main/resources/assets/ancientwarfare/template/default_structure_pack.zip b/src/main/resources/assets/ancientwarfare/template/default_structure_pack.zip