From 4547718b4e216ff4a24fce2238abd6ea7debc351 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Tue, 11 Sep 2018 10:52:48 -0700
Subject: [PATCH] Fixed for 'zip' library type

---
 src/lime/tools/AssetHelper.hx        |  2 +-
 src/lime/utils/PackedAssetLibrary.hx | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/lime/tools/AssetHelper.hx b/src/lime/tools/AssetHelper.hx
index db98311db..b2477db38 100644
--- a/src/lime/tools/AssetHelper.hx
+++ b/src/lime/tools/AssetHelper.hx
@@ -794,7 +794,7 @@ class AssetHelper {
 					var data = new Asset ("", "manifest/" + library.name + ".json", AssetType.MANIFEST);
 					data.library = library.name;
 					manifest.libraryType = "lime.utils.PackedAssetLibrary";
-					manifest.libraryArgs = [ "lib/" + filename, library.type ];
+					manifest.libraryArgs = [ "lib/" + filename, type ];
 					data.data = manifest.serialize ();
 					data.embed = true;
 
diff --git a/src/lime/utils/PackedAssetLibrary.hx b/src/lime/utils/PackedAssetLibrary.hx
index 89d2e7a90..079ebe490 100644
--- a/src/lime/utils/PackedAssetLibrary.hx
+++ b/src/lime/utils/PackedAssetLibrary.hx
@@ -84,7 +84,7 @@ import flash.media.Sound;
 			var bytes = Bytes.alloc (lengths[id]);
 			bytes.blit (0, packedData, positions[id], lengths[id]);
 			if (type == "gzip") bytes = bytes.decompress (GZIP);
-			else if (type == "deflate") bytes = bytes.decompress (DEFLATE);
+			else if (type == "zip" || type == "deflate") bytes = bytes.decompress (DEFLATE);
 			return AudioBuffer.fromBytes (bytes);
 
 		}
@@ -111,7 +111,7 @@ import flash.media.Sound;
 			var bytes = Bytes.alloc (lengths[id]);
 			bytes.blit (0, packedData, positions[id], lengths[id]);
 			if (type == "gzip") bytes = bytes.decompress (GZIP);
-			else if (type == "deflate") bytes = bytes.decompress (DEFLATE);
+			else if (type == "zip" || type == "deflate") bytes = bytes.decompress (DEFLATE);
 			return bytes;
 
 		}
@@ -137,7 +137,7 @@ import flash.media.Sound;
 			var bytes = Bytes.alloc (lengths[id]);
 			bytes.blit (0, packedData, positions[id], lengths[id]);
 			if (type == "gzip") bytes = bytes.decompress (GZIP);
-			else if (type == "deflate") bytes = bytes.decompress (DEFLATE);
+			else if (type == "zip" || type == "deflate") bytes = bytes.decompress (DEFLATE);
 			return Font.fromBytes (bytes);
 
 		}
@@ -159,7 +159,7 @@ import flash.media.Sound;
 			var bytes = Bytes.alloc (lengths[id]);
 			bytes.blit (0, packedData, positions[id], lengths[id]);
 			if (type == "gzip") bytes = bytes.decompress (GZIP);
-			else if (type == "deflate") bytes = bytes.decompress (DEFLATE);
+			else if (type == "zip" || type == "deflate") bytes = bytes.decompress (DEFLATE);
 			return Image.fromBytes (bytes);
 
 		}
@@ -173,12 +173,12 @@ import flash.media.Sound;
 
 			return cachedText.get (id);
 
-		} else if (type == "gzip" || type == "deflate") {
+		} else if (type == "gzip" || type == "zip" || type == "deflate") {
 
 			var bytes = Bytes.alloc (lengths[id]);
 			bytes.blit (0, packedData, positions[id], lengths[id]);
 			if (type == "gzip") bytes = bytes.decompress (GZIP);
-			else if (type == "deflate") bytes = bytes.decompress (DEFLATE);
+			else if (type == "zip" || type == "deflate") bytes = bytes.decompress (DEFLATE);
 			return bytes.getString (0, bytes.length);
 
 		} else {
@@ -325,7 +325,7 @@ import flash.media.Sound;
 			var bytes = Bytes.alloc (lengths[id]);
 			bytes.blit (0, packedData, positions[id], lengths[id]);
 			if (type == "gzip") bytes = bytes.decompress (GZIP);
-			else if (type == "deflate") bytes = bytes.decompress (DEFLATE);
+			else if (type == "zip" || type == "deflate") bytes = bytes.decompress (DEFLATE);
 			return Future.withValue (AudioBuffer.fromBytes (bytes));
 
 		}
@@ -347,7 +347,7 @@ import flash.media.Sound;
 			var bytes = Bytes.alloc (lengths[id]);
 			bytes.blit (0, packedData, positions[id], lengths[id]);
 			if (type == "gzip") bytes = bytes.decompress (GZIP);
-			else if (type == "deflate") bytes = bytes.decompress (DEFLATE);
+			else if (type == "zip" || type == "deflate") bytes = bytes.decompress (DEFLATE);
 			return Future.withValue (bytes);
 
 		}
@@ -373,7 +373,7 @@ import flash.media.Sound;
 			var bytes = Bytes.alloc (lengths[id]);
 			bytes.blit (0, packedData, positions[id], lengths[id]);
 			if (type == "gzip") bytes = bytes.decompress (GZIP);
-			else if (type == "deflate") bytes = bytes.decompress (DEFLATE);
+			else if (type == "zip" || type == "deflate") bytes = bytes.decompress (DEFLATE);
 			return Font.loadFromBytes (bytes);
 
 		}
@@ -431,7 +431,7 @@ import flash.media.Sound;
 			var bytes = Bytes.alloc (lengths[id]);
 			bytes.blit (0, packedData, positions[id], lengths[id]);
 			if (type == "gzip") bytes = bytes.decompress (GZIP);
-			else if (type == "deflate") bytes = bytes.decompress (DEFLATE);
+			else if (type == "zip" || type == "deflate") bytes = bytes.decompress (DEFLATE);
 			return Image.loadFromBytes (bytes);
 
 		}
@@ -466,7 +466,7 @@ import flash.media.Sound;
 			var bytes = Bytes.alloc (lengths[id]);
 			bytes.blit (0, packedData, positions[id], lengths[id]);
 			if (type == "gzip") bytes = bytes.decompress (GZIP);
-			else if (type == "deflate") bytes = bytes.decompress (DEFLATE);
+			else if (type == "zip" || type == "deflate") bytes = bytes.decompress (DEFLATE);
 			return Future.withValue (bytes.getString (0, bytes.length));
 
 		} else {