Style patch part1. based on newly released astyle 1.24.

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1790 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 28 insertions, 24 deletions

diff --git a/src/apps/mplayerc/libpng.h b/src/apps/mplayerc/libpng.h
index 8593b1fba..bedc25e92 100644
--- a/src/apps/mplayerc/libpng.h
+++ b/src/apps/mplayerc/libpng.h
@@ -23,7 +23,11 @@
 

 #pragma once

 

-struct png_t {unsigned char* data; unsigned int size, pos;};

+struct png_t

+{

+    unsigned char* data;

+    unsigned int size, pos;

+};

 

 #ifdef __cplusplus

 

@@ -34,31 +38,31 @@ extern "C" unsigned char* DecompressPNG(struct png_t* png, int* w, int* h);
 class CPngImage : public CImage

 {

 public:

-	bool LoadFromResource(UINT id)

-	{

-		bool ret = false;

+    bool LoadFromResource(UINT id)

+    {

+        bool ret = false;

 

-		CStringA str;

-		if(LoadResource(id, str, _T("FILE")))

-		{

-			struct png_t png;

-			png.data = (unsigned char*)(LPCSTR)str;

-			png.size = str.GetLength();

-			int w, h;

-			if(BYTE* p = DecompressPNG(&png, &w, &h))

-			{

-				if(Create(w, -h, 32))

-				{

-					for(int y = 0; y < h; y++) 

-						memcpy(GetPixelAddress(0, y), &p[w*4*y], w*4);

-					ret = true;

-				}

+        CStringA str;

+        if(LoadResource(id, str, _T("FILE")))

+        {

+            struct png_t png;

+            png.data = (unsigned char*)(LPCSTR)str;

+            png.size = str.GetLength();

+            int w, h;

+            if(BYTE* p = DecompressPNG(&png, &w, &h))

+            {

+                if(Create(w, -h, 32))

+                {

+                    for(int y = 0; y < h; y++)

+                        memcpy(GetPixelAddress(0, y), &p[w*4*y], w*4);

+                    ret = true;

+                }

 

-				free(p);

-			}

-		}

+                free(p);

+            }

+        }

 

-		return ret;

-	}

+        return ret;

+    }

 };

 #endif /* __cplusplus */