Skip to content

Commit

Permalink
changed: switch to using namespace std; to avoid std::min/#define min…
Browse files Browse the repository at this point in the history
… sillies on win32

(cherry picked from commit b165f2585b1c5aca3ba7bec8cd6def294e5ab1d5)

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@33758 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information
spiff_ committed Sep 13, 2010
1 parent b22115e commit 6dc041e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion guilib/DDSImage.cpp
Expand Up @@ -32,6 +32,8 @@ using namespace XFILE;
#include "SimpleFS.h"
#endif

using namespace std;

CDDSImage::CDDSImage()
{
m_data = NULL;
Expand Down Expand Up @@ -122,7 +124,7 @@ bool CDDSImage::Create(const std::string &outputFile, unsigned int width, unsign
{ // use ARGB
Allocate(width, height, XB_FMT_A8R8G8B8);
for (unsigned int i = 0; i < height; i++)
memcpy(m_data + i * width * 4, brga + i * pitch, std::min(width * 4, pitch));
memcpy(m_data + i * width * 4, brga + i * pitch, min(width * 4, pitch));
}
return WriteFile(outputFile);
}
Expand Down

0 comments on commit 6dc041e

Please sign in to comment.