Merge pull request #4232 from lioncash/sw

SWOGLWindow: Minor changes
dolphin-emu · Sep 22, 2016 · d0e7f30 · d0e7f30
2 parents 023eb34 + fc41e98
commit d0e7f30
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Source/Core/VideoBackends/Software/SWOGLWindow.cpp b/Source/Core/VideoBackends/Software/SWOGLWindow.cpp
@@ -86,11 +86,10 @@ void SWOGLWindow::Prepare()
 
 void SWOGLWindow::PrintText(const std::string& text, int x, int y, u32 color)
 {
-  TextData data{text, x, y, color};
-  m_text.emplace_back(data);
+  m_text.push_back({text, x, y, color});
 }
 
-void SWOGLWindow::ShowImage(u8* data, int stride, int width, int height, float aspect)
+void SWOGLWindow::ShowImage(const u8* data, int stride, int width, int height, float aspect)
 {
   GLInterface->MakeCurrent();
   GLInterface->Update();

diff --git a/Source/Core/VideoBackends/Software/SWOGLWindow.h b/Source/Core/VideoBackends/Software/SWOGLWindow.h
@@ -20,7 +20,7 @@ class SWOGLWindow
   void PrintText(const std::string& text, int x, int y, u32 color);
 
   // Image to show, will be swapped immediately
-  void ShowImage(u8* data, int stride, int width, int height, float aspect);
+  void ShowImage(const u8* data, int stride, int width, int height, float aspect);
 
   int PeekMessages();