From 688e5a3af61ca78fab59a45d6a8bd673e583bcb8 Mon Sep 17 00:00:00 2001
From: Raul Tambre <raul.tambre@gmail.com>
Date: Sun, 21 Dec 2014 21:44:07 +0200
Subject: [PATCH] Fix compiling

---
 rpcs3/Emu/Cell/SPURecompilerCore.cpp |  2 +-
 rpcs3/Gui/MemoryViewer.cpp           | 60 ++++++++++++++--------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/rpcs3/Emu/Cell/SPURecompilerCore.cpp b/rpcs3/Emu/Cell/SPURecompilerCore.cpp
index c5edf35a7b..8d733bd8b4 100644
--- a/rpcs3/Emu/Cell/SPURecompilerCore.cpp
+++ b/rpcs3/Emu/Cell/SPURecompilerCore.cpp
@@ -25,7 +25,7 @@ SPURecompilerCore::SPURecompilerCore(SPUThread& cpu)
 	memset(entry, 0, sizeof(entry));
 	X86CpuInfo inf;
 	X86CpuUtil::detect(&inf);
-	if (!inf.hasFeature(kX86CpuFeatureSse41))
+	if (!inf.hasFeature(kX86CpuFeatureSSE4_1))
 	{
 		LOG_ERROR(SPU, "SPU JIT requires SSE4.1 instruction set support");
 		Emu.Pause();
diff --git a/rpcs3/Gui/MemoryViewer.cpp b/rpcs3/Gui/MemoryViewer.cpp
index 73b57c835e..59f3917713 100644
--- a/rpcs3/Gui/MemoryViewer.cpp
+++ b/rpcs3/Gui/MemoryViewer.cpp
@@ -22,12 +22,12 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent)
 	wxStaticBoxSizer* s_tools_mem = new wxStaticBoxSizer(wxHORIZONTAL, this, "Memory Viewer Options");
 
 	wxStaticBoxSizer* s_tools_mem_addr = new wxStaticBoxSizer(wxHORIZONTAL, this, "Address");
-	t_addr = new wxTextCtrl(this, wxID_ANY, "00000000", wxDefaultPosition, wxSize(60,-1));
+	t_addr = new wxTextCtrl(this, wxID_ANY, "00000000", wxDefaultPosition, wxSize(60, -1));
 	t_addr->SetMaxLength(8);
 	s_tools_mem_addr->Add(t_addr);
 
 	wxStaticBoxSizer* s_tools_mem_bytes = new wxStaticBoxSizer(wxHORIZONTAL, this, "Bytes");
-	sc_bytes = new wxSpinCtrl(this, wxID_ANY, "16", wxDefaultPosition, wxSize(44,-1));
+	sc_bytes = new wxSpinCtrl(this, wxID_ANY, "16", wxDefaultPosition, wxSize(44, -1));
 	sc_bytes->SetRange(1, 16);
 	s_tools_mem_bytes->Add(sc_bytes);
 
@@ -49,8 +49,8 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent)
 	wxStaticBoxSizer* s_tools_img = new wxStaticBoxSizer(wxHORIZONTAL, this, "Raw Image Preview");
 
 	wxStaticBoxSizer* s_tools_img_size = new wxStaticBoxSizer(wxHORIZONTAL, this, "Size");
-	sc_img_size_x = new wxSpinCtrl(this, wxID_ANY, "256", wxDefaultPosition, wxSize(60,-1));
-	sc_img_size_y = new wxSpinCtrl(this, wxID_ANY, "256", wxDefaultPosition, wxSize(60,-1));
+	sc_img_size_x = new wxSpinCtrl(this, wxID_ANY, "256", wxDefaultPosition, wxSize(60, -1));
+	sc_img_size_y = new wxSpinCtrl(this, wxID_ANY, "256", wxDefaultPosition, wxSize(60, -1));
 	s_tools_img_size->Add(sc_img_size_x);
 	s_tools_img_size->Add(new wxStaticText(this, wxID_ANY, " x "));
 	s_tools_img_size->Add(sc_img_size_y);
@@ -72,7 +72,7 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent)
 
 	//Tools: Run tools
 	wxStaticBoxSizer* s_tools_buttons = new wxStaticBoxSizer(wxVERTICAL, this, "Tools");
-	wxButton* b_img = new wxButton(this, wxID_ANY, "View\nimage", wxDefaultPosition, wxSize(52,-1));
+	wxButton* b_img = new wxButton(this, wxID_ANY, "View\nimage", wxDefaultPosition, wxSize(52, -1));
 	s_tools_buttons->Add(b_img);
 
 	//Tools: Tools = Memory Viewer Options + Raw Image Preview Options + Buttons
@@ -108,8 +108,8 @@ MemoryViewerPanel::MemoryViewerPanel(wxWindow* parent)
 	//Memory Panel: Set size of the wxTextCtrl's
 	int x, y;
 	t_mem_hex->GetTextExtent(wxT("T"), &x, &y);
-	t_mem_hex->SetMinSize(wxSize(x * 3*m_colcount + 6, 228));
-	t_mem_hex->SetMaxSize(wxSize(x * 3*m_colcount + 6, 228));
+	t_mem_hex->SetMinSize(wxSize(x * 3 * m_colcount + 6, 228));
+	t_mem_hex->SetMaxSize(wxSize(x * 3 * m_colcount + 6, 228));
 	t_mem_ascii->SetMinSize(wxSize(x * m_colcount + 6, 228));
 	t_mem_ascii->SetMaxSize(wxSize(x * m_colcount + 6, 228));
 
@@ -156,8 +156,8 @@ void MemoryViewerPanel::OnChangeToolsBytes(wxCommandEvent& event)
 
 	int x, y;
 	t_mem_hex->GetTextExtent(wxT("T"), &x, &y);
-	t_mem_hex->SetMinSize(wxSize(x * 3*m_colcount + 6, 228));
-	t_mem_hex->SetMaxSize(wxSize(x * 3*m_colcount + 6, 228));
+	t_mem_hex->SetMinSize(wxSize(x * 3 * m_colcount + 6, 228));
+	t_mem_hex->SetMaxSize(wxSize(x * 3 * m_colcount + 6, 228));
 	t_mem_ascii->SetMinSize(wxSize(x * m_colcount + 6, 228));
 	t_mem_ascii->SetMaxSize(wxSize(x * m_colcount + 6, 228));
 	this->Layout();
@@ -242,43 +242,43 @@ void MemoryViewerPanel::ShowImage(wxWindow* parent, u32 addr, int mode, u32 widt
 	break;
 
 	case(1): // ARGB
-		for (u32 y=0; y<height; y++){
-			for (u32 i=0, j=0; j<width*4; i+=3, j+=4){
-				convertedBuffer[i+0 + y*width*3] = originalBuffer[j+1 + y*width*4];
-				convertedBuffer[i+1 + y*width*3] = originalBuffer[j+2 + y*width*4];
-				convertedBuffer[i+2 + y*width*3] = originalBuffer[j+3 + y*width*4];
+		for (u32 y = 0; y < height; y++) {
+			for (u32 i = 0, j = 0; j < width * 4; i += 3, j += 4) {
+				convertedBuffer[i + 0 + y * width * 3] = originalBuffer[j + 1 + y * width * 4];
+				convertedBuffer[i + 1 + y * width * 3] = originalBuffer[j + 2 + y * width * 4];
+				convertedBuffer[i + 2 + y * width * 3] = originalBuffer[j + 3 + y * width * 4];
 			}
 		}
 	break;
 
 	case(2): // RGBA
-		for (u32 y=0; y<height; y++){
-			for (u32 i=0, j=0; j<width*4; i+=3, j+=4){
-				convertedBuffer[i+0 + y*width*3] = originalBuffer[j+0 + y*width*4];
-				convertedBuffer[i+1 + y*width*3] = originalBuffer[j+1 + y*width*4];
-				convertedBuffer[i+2 + y*width*3] = originalBuffer[j+2 + y*width*4];
+		for (u32 y = 0; y < height; y++) {
+			for (u32 i = 0, j = 0; j < width * 4; i += 3, j += 4) {
+				convertedBuffer[i + 0 + y * width * 3] = originalBuffer[j + 0 + y * width * 4];
+				convertedBuffer[i + 1 + y * width * 3] = originalBuffer[j + 1 + y * width * 4];
+				convertedBuffer[i + 2 + y * width * 3] = originalBuffer[j + 2 + y * width * 4];
 			}
 		}
 	break;
 
 	case(3): // ABGR
-		for (u32 y=0; y<height; y++){
-			for (u32 i=0, j=0; j<width*4; i+=3, j+=4){
-				convertedBuffer[i+0 + y*width*3] = originalBuffer[j+3 + y*width*4];
-				convertedBuffer[i+1 + y*width*3] = originalBuffer[j+2 + y*width*4];
-				convertedBuffer[i+2 + y*width*3] = originalBuffer[j+1 + y*width*4];
+		for (u32 y = 0; y < height; y++) {
+			for (u32 i = 0, j = 0; j < width * 4; i += 3, j += 4) {
+				convertedBuffer[i + 0 + y * width * 3] = originalBuffer[j + 3 + y * width * 4];
+				convertedBuffer[i + 1 + y * width * 3] = originalBuffer[j + 2 + y * width * 4];
+				convertedBuffer[i + 2 + y * width * 3] = originalBuffer[j + 1 + y * width * 4];
 			}
 		}
 	break;
 	}
 
 	// Flip vertically
-	if (flipv){
-		for (u32 y=0; y<height/2; y++){
-			for (u32 x=0; x<width*3; x++){
-				const u8 t = convertedBuffer[x + y*width*3];
-				convertedBuffer[x + y*width*3] = convertedBuffer[x + (height-y-1)*width*3];
-				convertedBuffer[x + (height-y-1)*width*3] = t;
+	if (flipv) {
+		for (u32 y = 0; y < height / 2; y++) {
+			for (u32 x = 0; x < width * 3; x++) {
+				const u8 t = convertedBuffer[x + y * width * 3];
+				convertedBuffer[x + y * width * 3] = convertedBuffer[x + (height - y - 1) * width * 3];
+				convertedBuffer[x + (height - y - 1) * width * 3] = t;
 			}
 		}
 	}