ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1554 from lioncash/unique 

ISOFile: Get rid of a delete call
This commit is contained in:
Lioncash 2014-11-15 20:27:59 -05:00
parent 43b8749c60 798a96bd2a
commit 5d2ca2dfcc
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/Core/DolphinWX/ISOFile.cpp
View File

@ -5,6 +5,7 @@
#include <cinttypes> #include <cinttypes>
#include <cstdio> #include <cstdio>
#include <cstring> #include <cstring>
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>
#include <wx/bitmap.h> #include <wx/bitmap.h>
@ -80,30 +81,26 @@ GameListItem::GameListItem(const std::string& _rFileName)
if (pFileSystem != nullptr || m_Platform == WII_WAD) if (pFileSystem != nullptr || m_Platform == WII_WAD)
{ {
DiscIO::IBannerLoader* pBannerLoader = DiscIO::CreateBannerLoader(*pFileSystem, pVolume); std::unique_ptr<DiscIO::IBannerLoader> pBannerLoader(DiscIO::CreateBannerLoader(*pFileSystem, pVolume));
if (pBannerLoader != nullptr) if (pBannerLoader != nullptr && pBannerLoader->IsValid())
{ {
if (pBannerLoader->IsValid()) if (m_Platform != WII_WAD)
m_banner_names = pBannerLoader->GetNames();
m_company = pBannerLoader->GetCompany();
m_descriptions = pBannerLoader->GetDescriptions();
std::vector<u32> Buffer = pBannerLoader->GetBanner(&m_ImageWidth, &m_ImageHeight);
u32* pData = &Buffer[0];
// resize vector to image size
m_pImage.resize(m_ImageWidth * m_ImageHeight * 3);
for (int i = 0; i < m_ImageWidth * m_ImageHeight; i++)
{ {
if (m_Platform != WII_WAD) m_pImage[i * 3 + 0] = (pData[i] & 0xFF0000) >> 16;
m_banner_names = pBannerLoader->GetNames(); m_pImage[i * 3 + 1] = (pData[i] & 0x00FF00) >> 8;
m_company = pBannerLoader->GetCompany(); m_pImage[i * 3 + 2] = (pData[i] & 0x0000FF) >> 0;
m_descriptions = pBannerLoader->GetDescriptions();
std::vector<u32> Buffer = pBannerLoader->GetBanner(&m_ImageWidth, &m_ImageHeight);
u32* pData = &Buffer[0];
// resize vector to image size
m_pImage.resize(m_ImageWidth * m_ImageHeight * 3);
for (int i = 0; i < m_ImageWidth * m_ImageHeight; i++)
{
m_pImage[i * 3 + 0] = (pData[i] & 0xFF0000) >> 16;
m_pImage[i * 3 + 1] = (pData[i] & 0x00FF00) >> 8;
m_pImage[i * 3 + 2] = (pData[i] & 0x0000FF) >> 0;
}
} }
delete pBannerLoader;
} }
delete pFileSystem; delete pFileSystem;