From 322a2cef1dd6bf91fee18190e1ab3ed937ed52a3 Mon Sep 17 00:00:00 2001
From: Gama11 <jensfischer95@gmail.com>
Date: Thu, 22 May 2014 16:30:29 +0200
Subject: [PATCH] FlxBitmapUtil -> FlxBitmapDataUtil

---
 flixel/system/debug/BitmapLog.hx                       | 4 ++--
 flixel/util/{FlxBitmapUtil.hx => FlxBitmapDataUtil.hx} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename flixel/util/{FlxBitmapUtil.hx => FlxBitmapDataUtil.hx} (99%)

diff --git a/flixel/system/debug/BitmapLog.hx b/flixel/system/debug/BitmapLog.hx
index f51336e717..072d1cb2e0 100644
--- a/flixel/system/debug/BitmapLog.hx
+++ b/flixel/system/debug/BitmapLog.hx
@@ -17,8 +17,8 @@ import flixel.math.FlxMath;
 import flixel.math.FlxPoint;
 import flixel.util.FlxSpriteUtil;
 import flixel.system.debug.FlxDebugger;
-import flixel.util.FlxBitmapUtil;
 import flixel.util.FlxStringUtil;
+using flixel.util.FlxBitmapDataUtil;
 
 /**
  * An output window that lets you paste BitmapData in the debugger overlay.
@@ -322,7 +322,7 @@ class BitmapLog extends Window
 		
 		var entryName:String = _curEntry.name;
 		var name:String = (entryName == "") ? "" : '"$entryName" | ' ;
-		_footerText.text = name + FlxStringUtil.formatBytes(FlxBitmapUtil.getMemorySize(_curBitmap));
+		_footerText.text = name + FlxStringUtil.formatBytes(_curBitmap.getMemorySize());
 		
 		resizeTexts();
 	}
diff --git a/flixel/util/FlxBitmapUtil.hx b/flixel/util/FlxBitmapDataUtil.hx
similarity index 99%
rename from flixel/util/FlxBitmapUtil.hx
rename to flixel/util/FlxBitmapDataUtil.hx
index ad4010de0d..14ce274a48 100644
--- a/flixel/util/FlxBitmapUtil.hx
+++ b/flixel/util/FlxBitmapDataUtil.hx
@@ -4,7 +4,7 @@ import flash.display.BitmapData;
 import flash.geom.Point;
 import flash.geom.Rectangle;
 
-class FlxBitmapUtil
+class FlxBitmapDataUtil
 {
 	public static function merge(sourceBitmapData:BitmapData, sourceRect:Rectangle, destBitmapData:BitmapData, destPoint:Point, redMultiplier:Int, greenMultiplier:Int, blueMultiplier:Int, alphaMultiplier:Int):Void
 	{