Fixing width and height properties, and also improving the dispose() …

…functionality
theturtle32 · Jan 7, 2012 · e4ac043 · e4ac043
1 parent a06f244
commit e4ac043
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 16 deletions.
diff --git a/AS3GifPlayer/src/com/worlize/gif/GIFDecoder.as b/AS3GifPlayer/src/com/worlize/gif/GIFDecoder.as
@@ -442,7 +442,6 @@ package com.worlize.gif
 			frameDecodedCount ++;
 			if (frameDecodedCount === framesToDecode && !_hasError) {
 				renderCompositedFrames();
-				cleanup();
 
 				var endTime:uint = (new Date()).valueOf();
 				totalDecodeTime = endTime - startTime;

diff --git a/AS3GifPlayer/src/com/worlize/gif/GIFPlayer.as b/AS3GifPlayer/src/com/worlize/gif/GIFPlayer.as
@@ -36,15 +36,15 @@ package com.worlize.gif
 		private var _frameCount:uint = 0;
 		private var _frames:Vector.<GIFFrame>;
 		private var _ready:Boolean = false;
+		private var _imageWidth:Number;
+		private var _imageHeight:Number;
 
 		public function GIFPlayer(autoPlay:Boolean = true) {
 			this.autoPlay = autoPlay;
 			if (stage) {
 				initMinFrameDelay();
 			}
-			else {
-				addEventListener(Event.ADDED_TO_STAGE, initMinFrameDelay);
-			}
+			addEventListener(Event.ADDED_TO_STAGE, initMinFrameDelay);
 			timer.addEventListener(TimerEvent.TIMER, handleTimer);
 			addEventListener(Event.REMOVED_FROM_STAGE, handleRemovedFromStage);
 		}
@@ -83,6 +83,7 @@ package com.worlize.gif
 			stop();
 			setReady(false);
 			unloadDecoder();
+			dispose();
 			initDecoder();
 		}
 
@@ -107,6 +108,9 @@ package com.worlize.gif
 			_frames = gifDecoder.frames;
 			_frameCount = _frames.length;
 			_currentFrame = -1;
+			_imageWidth = gifDecoder.width;
+			_imageHeight = gifDecoder.height;
+			gifDecoder.cleanup();
 			unloadDecoder();
 			setReady(true);
 			dispatchEvent(new Event('totalFramesChange'));
@@ -215,6 +219,13 @@ package com.worlize.gif
 			dispatchEvent(renderedEvent);
 		}
 
+		public function dispose():void {
+			if (_frames === null) { return; }
+			for (var i:int = 0; i < _frames.length; i ++) {
+				_frames[i].bitmapData.dispose();
+			}
+		}
+
 		public function get playing():Boolean {
 			return timer.running;
 		}
@@ -257,5 +268,13 @@ package com.worlize.gif
 		protected function handleAsyncDecodeError(event:AsyncDecodeErrorEvent):void {
 			dispatchEvent(event.clone());
 		}
+
+		override public function get width():Number {
+			return _imageWidth;
+		}
+
+		override public function get height():Number {
+			return _imageHeight;
+		}
 	}
 }
diff --git a/AS3GifPlayer/src/com/worlize/gif/blocks/ApplicationExtension.as b/AS3GifPlayer/src/com/worlize/gif/blocks/ApplicationExtension.as
@@ -52,8 +52,10 @@ package com.worlize.gif.blocks
 		}
 
 		public function dispose():void {
-			bytes.clear();
-			bytes = null;
+			if (bytes) {
+				bytes.clear();
+				bytes = null;
+			}
 		}
 	}
 }
diff --git a/AS3GifPlayer/src/com/worlize/gif/blocks/ColorTableBlock.as b/AS3GifPlayer/src/com/worlize/gif/blocks/ColorTableBlock.as
@@ -54,8 +54,10 @@ package com.worlize.gif.blocks
 		}
 
 		public function dispose():void {
-			cachedEncodedBytes.clear();
-			cachedEncodedBytes = null;
+			if (cachedEncodedBytes) {
+				cachedEncodedBytes.clear();
+				cachedEncodedBytes = null;
+			}
 		}
 	}
 }
diff --git a/AS3GifPlayer/src/com/worlize/gif/blocks/DataBlock.as b/AS3GifPlayer/src/com/worlize/gif/blocks/DataBlock.as
@@ -90,8 +90,10 @@ package com.worlize.gif.blocks
 		}
 
 		public function dispose():void {
-			bytes.clear();
-			bytes = null;
+			if (bytes) {
+				bytes.clear();
+				bytes = null;
+			}
 		}
 	}
 }
diff --git a/AS3GifPlayer/src/com/worlize/gif/blocks/HeaderBlock.as b/AS3GifPlayer/src/com/worlize/gif/blocks/HeaderBlock.as
@@ -51,8 +51,10 @@ package com.worlize.gif.blocks
 		}
 
 		public function dispose():void {
-			bytes.clear();
-			bytes = null;
+			if (bytes) {
+				bytes.clear();
+				bytes = null;
+			}
 		}
 	}
 }
diff --git a/AS3GifPlayer/src/com/worlize/gif/blocks/ImageDataBlock.as b/AS3GifPlayer/src/com/worlize/gif/blocks/ImageDataBlock.as
@@ -42,8 +42,10 @@ package com.worlize.gif.blocks
 		}
 
 		public function dispose():void {
-			bytes.clear();
-			bytes = null;
+			if (bytes) {
+				bytes.clear();
+				bytes = null;
+			}
 		}
 	}
 }
diff --git a/AS3GifPlayer/src/com/worlize/gif/blocks/UnknownExtension.as b/AS3GifPlayer/src/com/worlize/gif/blocks/UnknownExtension.as
@@ -29,8 +29,10 @@ package com.worlize.gif.blocks
 		}
 
 		public function dispose():void {
-			bytes.clear();
-			bytes = null;
+			if (bytes) {
+				bytes.clear();
+				bytes = null;
+			}
 		}
 	}
 }