add *.user, Win32, and x64 build dir to ignore list for DebuggerUICommon and Unit Tests

add *.aps to ignore list for DolphinWX dir
add eol-style native to 120 or so files

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3689 8ced0084-cf51-0410-be5f-012b33b47a6e

1 files changed, 154 insertions, 154 deletions

diff --git a/Source/Core/VideoCommon/Src/HiresTextures.cpp b/Source/Core/VideoCommon/Src/HiresTextures.cpp
index 80540b920e..58861fe93b 100644
--- a/Source/Core/VideoCommon/Src/HiresTextures.cpp
+++ b/Source/Core/VideoCommon/Src/HiresTextures.cpp
@@ -1,154 +1,154 @@
-// Copyright (C) 2003-2009 Dolphin Project.

-

-// This program is free software: you can redistribute it and/or modify

-// it under the terms of the GNU General Public License as published by

-// the Free Software Foundation, version 2.0.

-

-// This program is distributed in the hope that it will be useful,

-// but WITHOUT ANY WARRANTY; without even the implied warranty of

-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-// GNU General Public License 2.0 for more details.

-

-// A copy of the GPL 2.0 should have been included with the program.

-// If not, see http://www.gnu.org/licenses/

-

-// Official SVN repository and contact information can be found at

-// http://code.google.com/p/dolphin-emu/

-

-#include "HiresTextures.h"

-

-#include <cstring>

-#include <utility>

-#include <algorithm>

-#include "SOIL.h"

-#include "CommonPaths.h"

-#include "FileUtil.h"

-#include "FileSearch.h"

-

-namespace HiresTextures

-{

-

-std::map<std::string, std::string> textureMap;

-

-void Init(const char *gameCode)

-{

-	static bool bCheckedDir;

-

-	CFileSearch::XStringVector Directories;

-	//Directories.push_back(std::string(FULL_HIRES_TEXTURES_DIR));

-	char szDir[MAX_PATH];

-	sprintf(szDir,"%s/%s",FULL_HIRES_TEXTURES_DIR,gameCode);

-	Directories.push_back(std::string(szDir));

-	

-

-	for (u32 i = 0; i < Directories.size(); i++)

-	{

-		File::FSTEntry FST_Temp;

-		File::ScanDirectoryTree(Directories.at(i).c_str(), FST_Temp);

-		for (u32 j = 0; j < FST_Temp.children.size(); j++)

-		{

-			if (FST_Temp.children.at(j).isDirectory)

-			{

-				bool duplicate = false;

-				NormalizeDirSep(&(FST_Temp.children.at(j).physicalName));

-				for (u32 k = 0; k < Directories.size(); k++)

-				{

-					NormalizeDirSep(&Directories.at(k));

-					if (strcmp(Directories.at(k).c_str(), FST_Temp.children.at(j).physicalName.c_str()) == 0)

-					{

-						duplicate = true;

-						break;

-					}

-				}

-				if (!duplicate)

-					Directories.push_back(FST_Temp.children.at(j).physicalName.c_str());

-			}

-		}

-	}

-

-	CFileSearch::XStringVector Extensions;

-	Extensions.push_back("*.png");

-	Extensions.push_back("*.bmp");

-	Extensions.push_back("*.tga");

-	Extensions.push_back("*.dds");

-	Extensions.push_back("*.jpg"); // Why not? Could be useful for large photo-like textures

-

-	CFileSearch FileSearch(Extensions, Directories);

-	const CFileSearch::XStringVector& rFilenames = FileSearch.GetFileNames();

-	char code[MAX_PATH];

-	sprintf(code, "%s_", gameCode);

-

-	if (rFilenames.size() > 0)

-	{

-		for (u32 i = 0; i < rFilenames.size(); i++)

-		{

-			std::string FileName;

-			SplitPath(rFilenames[i], NULL, &FileName, NULL);

-

-			if (FileName.substr(0, strlen(code)).compare(code) == 0 && textureMap.find(FileName) == textureMap.end())

-				textureMap.insert(std::map<std::string, std::string>::value_type(FileName, rFilenames[i]));

-		}

-	}

-}

-

-void Shutdown()

-{

-	textureMap.clear();

-}

-

-PC_TexFormat GetHiresTex(const char *fileName, int *pWidth, int *pHeight, int texformat, u8 *data)

-{

-	std::string key(fileName);

-

-	if(textureMap.find(key) == textureMap.end())

-		return PC_TEX_FMT_NONE;

-

-	int width;

-	int height;

-	int channels;

-

-	u8 *temp = SOIL_load_image(textureMap[key].c_str(), &width, &height, &channels, SOIL_LOAD_RGBA);

-

-	if (temp == NULL) {

-		ERROR_LOG(VIDEO, "Custom texture %s failed to load", textureMap[key].c_str(), width, height);

-		SOIL_free_image_data(temp);

-		return PC_TEX_FMT_NONE;

-	}

-

-	if (width > 1024 || height > 1024) {

-		ERROR_LOG(VIDEO, "Custom texture %s is too large (%ix%i); textures can only be 1024 pixels tall and wide", textureMap[key].c_str(), width, height);

-		SOIL_free_image_data(temp);

-		return PC_TEX_FMT_NONE;

-	}

-

-	int offset = 0;

-	PC_TexFormat returnTex;

-

-	switch (texformat)

-	{

-	case GX_TF_I4:

-	case GX_TF_I8:

-	case GX_TF_IA4:

-	case GX_TF_IA8:

-		for (int i = 0; i < width * height * 4; i += 4)

-		{

-			// Rather than use a luminosity function, just use the most intense color for luminance

-			data[offset++] = *std::max_element(temp+i, temp+i+3);

-			data[offset++] = temp[i+3];

-		}

-		returnTex = PC_TEX_FMT_IA8;

-		break;

-	default:

-		memcpy(data, temp, width*height*4);

-		returnTex = PC_TEX_FMT_RGBA32;

-		break;

-	}

-

-	*pWidth = width;

-	*pHeight = height;

-	SOIL_free_image_data(temp);

-	INFO_LOG(VIDEO, "loading custom texture from %s", textureMap[key].c_str());

-	return returnTex;

-}

-

-}

+// Copyright (C) 2003-2009 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#include "HiresTextures.h"
+
+#include <cstring>
+#include <utility>
+#include <algorithm>
+#include "SOIL.h"
+#include "CommonPaths.h"
+#include "FileUtil.h"
+#include "FileSearch.h"
+
+namespace HiresTextures
+{
+
+std::map<std::string, std::string> textureMap;
+
+void Init(const char *gameCode)
+{
+	static bool bCheckedDir;
+
+	CFileSearch::XStringVector Directories;
+	//Directories.push_back(std::string(FULL_HIRES_TEXTURES_DIR));
+	char szDir[MAX_PATH];
+	sprintf(szDir,"%s/%s",FULL_HIRES_TEXTURES_DIR,gameCode);
+	Directories.push_back(std::string(szDir));
+	
+
+	for (u32 i = 0; i < Directories.size(); i++)
+	{
+		File::FSTEntry FST_Temp;
+		File::ScanDirectoryTree(Directories.at(i).c_str(), FST_Temp);
+		for (u32 j = 0; j < FST_Temp.children.size(); j++)
+		{
+			if (FST_Temp.children.at(j).isDirectory)
+			{
+				bool duplicate = false;
+				NormalizeDirSep(&(FST_Temp.children.at(j).physicalName));
+				for (u32 k = 0; k < Directories.size(); k++)
+				{
+					NormalizeDirSep(&Directories.at(k));
+					if (strcmp(Directories.at(k).c_str(), FST_Temp.children.at(j).physicalName.c_str()) == 0)
+					{
+						duplicate = true;
+						break;
+					}
+				}
+				if (!duplicate)
+					Directories.push_back(FST_Temp.children.at(j).physicalName.c_str());
+			}
+		}
+	}
+
+	CFileSearch::XStringVector Extensions;
+	Extensions.push_back("*.png");
+	Extensions.push_back("*.bmp");
+	Extensions.push_back("*.tga");
+	Extensions.push_back("*.dds");
+	Extensions.push_back("*.jpg"); // Why not? Could be useful for large photo-like textures
+
+	CFileSearch FileSearch(Extensions, Directories);
+	const CFileSearch::XStringVector& rFilenames = FileSearch.GetFileNames();
+	char code[MAX_PATH];
+	sprintf(code, "%s_", gameCode);
+
+	if (rFilenames.size() > 0)
+	{
+		for (u32 i = 0; i < rFilenames.size(); i++)
+		{
+			std::string FileName;
+			SplitPath(rFilenames[i], NULL, &FileName, NULL);
+
+			if (FileName.substr(0, strlen(code)).compare(code) == 0 && textureMap.find(FileName) == textureMap.end())
+				textureMap.insert(std::map<std::string, std::string>::value_type(FileName, rFilenames[i]));
+		}
+	}
+}
+
+void Shutdown()
+{
+	textureMap.clear();
+}
+
+PC_TexFormat GetHiresTex(const char *fileName, int *pWidth, int *pHeight, int texformat, u8 *data)
+{
+	std::string key(fileName);
+
+	if(textureMap.find(key) == textureMap.end())
+		return PC_TEX_FMT_NONE;
+
+	int width;
+	int height;
+	int channels;
+
+	u8 *temp = SOIL_load_image(textureMap[key].c_str(), &width, &height, &channels, SOIL_LOAD_RGBA);
+
+	if (temp == NULL) {
+		ERROR_LOG(VIDEO, "Custom texture %s failed to load", textureMap[key].c_str(), width, height);
+		SOIL_free_image_data(temp);
+		return PC_TEX_FMT_NONE;
+	}
+
+	if (width > 1024 || height > 1024) {
+		ERROR_LOG(VIDEO, "Custom texture %s is too large (%ix%i); textures can only be 1024 pixels tall and wide", textureMap[key].c_str(), width, height);
+		SOIL_free_image_data(temp);
+		return PC_TEX_FMT_NONE;
+	}
+
+	int offset = 0;
+	PC_TexFormat returnTex;
+
+	switch (texformat)
+	{
+	case GX_TF_I4:
+	case GX_TF_I8:
+	case GX_TF_IA4:
+	case GX_TF_IA8:
+		for (int i = 0; i < width * height * 4; i += 4)
+		{
+			// Rather than use a luminosity function, just use the most intense color for luminance
+			data[offset++] = *std::max_element(temp+i, temp+i+3);
+			data[offset++] = temp[i+3];
+		}
+		returnTex = PC_TEX_FMT_IA8;
+		break;
+	default:
+		memcpy(data, temp, width*height*4);
+		returnTex = PC_TEX_FMT_RGBA32;
+		break;
+	}
+
+	*pWidth = width;
+	*pHeight = height;
+	SOIL_free_image_data(temp);
+	INFO_LOG(VIDEO, "loading custom texture from %s", textureMap[key].c_str());
+	return returnTex;
+}
+
+}