From 7f512739502dba15dfe3fd45d57f69d428e3d795 Mon Sep 17 00:00:00 2001
From: Birunthan Mohanathas <birunthan@mohanathas.com>
Date: Tue, 26 Mar 2013 21:20:13 +0200
Subject: [PATCH] Cosmetics

---
 Common/Gfx/CanvasGDIP.h          |  4 ++--
 Common/Gfx/TextFormatGDIP.h      |  4 ++--
 Common/Gfx/WICBitmapLockGDIP.cpp |  5 +++++
 Common/Gfx/WICBitmapLockGDIP.h   | 10 +++++-----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Common/Gfx/CanvasGDIP.h b/Common/Gfx/CanvasGDIP.h
index 938a448b..ed3f1e3e 100644
--- a/Common/Gfx/CanvasGDIP.h
+++ b/Common/Gfx/CanvasGDIP.h
@@ -16,8 +16,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef RM_GFX_CANVASGDI_H_
-#define RM_GFX_CANVASGDI_H_
+#ifndef RM_GFX_CANVASGDIP_H_
+#define RM_GFX_CANVASGDIP_H_
 
 #include "Canvas.h"
 #include "TextFormatGDIP.h"
diff --git a/Common/Gfx/TextFormatGDIP.h b/Common/Gfx/TextFormatGDIP.h
index 2d2536bd..df2d44b2 100644
--- a/Common/Gfx/TextFormatGDIP.h
+++ b/Common/Gfx/TextFormatGDIP.h
@@ -16,8 +16,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef RM_GFX_TEXTFORMATGDI_H_
-#define RM_GFX_TEXTFORMATGDI_H_
+#ifndef RM_GFX_TEXTFORMATGDIP_H_
+#define RM_GFX_TEXTFORMATGDIP_H_
 
 #include "TextFormat.h"
 #include <GdiPlus.h>
diff --git a/Common/Gfx/WICBitmapLockGDIP.cpp b/Common/Gfx/WICBitmapLockGDIP.cpp
index 38deb5b2..80e28448 100644
--- a/Common/Gfx/WICBitmapLockGDIP.cpp
+++ b/Common/Gfx/WICBitmapLockGDIP.cpp
@@ -21,6 +21,11 @@
 
 namespace Gfx {
 
+WICBitmapLockGDIP::WICBitmapLockGDIP() :
+	m_RefCount(1)
+{
+}
+
 IFACEMETHODIMP WICBitmapLockGDIP::QueryInterface(REFIID riid, void** ppvObject)
 {
 	return E_NOTIMPL;
diff --git a/Common/Gfx/WICBitmapLockGDIP.h b/Common/Gfx/WICBitmapLockGDIP.h
index a2096b73..b0d1ac9f 100644
--- a/Common/Gfx/WICBitmapLockGDIP.h
+++ b/Common/Gfx/WICBitmapLockGDIP.h
@@ -16,8 +16,8 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#ifndef RM_GFX_BITMAPLOCKGDI_H_
-#define RM_GFX_BITMAPLOCKGDI_H_
+#ifndef RM_GFX_WICBITMAPLOCKGDIP_H_
+#define RM_GFX_WICBITMAPLOCKGDIP_H_
 
 #include <Windows.h>
 #include <GdiPlus.h>
@@ -30,7 +30,9 @@ namespace Gfx {
 class WICBitmapLockGDIP : public IWICBitmapLock
 {
 public:
-	WICBitmapLockGDIP() : m_RefCount(0) {}
+	WICBitmapLockGDIP();
+
+	Gdiplus::BitmapData* GetBitmapData() { return &m_BitmapData; }
 
 	// IUnknown
 	IFACEMETHOD(QueryInterface)(REFIID riid, void** ppvObject);
@@ -43,8 +45,6 @@ public:
 	IFACEMETHOD(GetDataPointer)(UINT* pcbBufferSize, BYTE** ppbData);
 	IFACEMETHOD(GetPixelFormat)(WICPixelFormatGUID* pPixelFormat);
 
-	Gdiplus::BitmapData* GetBitmapData() { return &m_BitmapData; }
-
 private:
 	Gdiplus::BitmapData m_BitmapData;
 	UINT m_RefCount;