diff options
| author | jmarshallnz <jmarshallnz@svn> | 2009-09-23 02:42:37 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2009-09-23 02:42:37 +0000 |
| commit | adab057db495446713b6ff665614ef16a0d7f992 (patch) | |
| tree | f821eaa9ca234eaa3d69ca26479d7a6bc541a735 /guilib/TextureBundle.h | |
| parent | 1001353789febdece3420424c8e4cf291a88a946 (diff) | |
cleanup: Indicate why system.h is included in a header, and remove where reasonable.
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23100 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/TextureBundle.h')
| -rw-r--r-- | guilib/TextureBundle.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/guilib/TextureBundle.h b/guilib/TextureBundle.h index c538d760a3..5ae9aebca0 100644 --- a/guilib/TextureBundle.h +++ b/guilib/TextureBundle.h @@ -22,8 +22,7 @@ */ #include "StdString.h" -#include "system.h" - +#include <stdint.h> #include <map> class CAutoTexBuffer; @@ -33,9 +32,9 @@ class CTextureBundle { struct FileHeader_t { - DWORD Offset; - DWORD UnpackedSize; - DWORD PackedSize; + uint32_t Offset; + uint32_t UnpackedSize; + uint32_t PackedSize; }; FILE* m_hFile; @@ -47,7 +46,7 @@ class CTextureBundle bool m_themeBundle; bool OpenBundle(); - HRESULT LoadFile(const CStdString& Filename, CAutoTexBuffer& UnpackedBuf); + bool LoadFile(const CStdString& Filename, CAutoTexBuffer& UnpackedBuf); public: CTextureBundle(void); @@ -60,7 +59,7 @@ public: void GetTexturesFromPath(const CStdString &path, std::vector<CStdString> &textures); static CStdString Normalize(const CStdString &name); - HRESULT LoadTexture(const CStdString& Filename, CBaseTexture** ppTexture, + bool LoadTexture(const CStdString& Filename, CBaseTexture** ppTexture, int &width, int &height); int LoadAnim(const CStdString& Filename, CBaseTexture*** ppTextures, |