revert r1783

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

1 files changed, 24 insertions, 28 deletions

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

 #pragma once

 

-struct png_t

-{

-    unsigned char* data;

-    unsigned int size, pos;

-};

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

 

 #ifdef __cplusplus

 

@@ -38,31 +34,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 */