Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8410 from latot/mini

Browse source 
little changes
This commit is contained in:
Henrik Rydgård 2016-01-17 00:44:07 +01:00
commit 067095e2b4
7 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -1,5 +1,7 @@
# https://travis-ci.org
sudo: required
language: cpp
os: linux

3
Core/FileSystems/ISOFileSystem.cpp
View file

@ -814,8 +814,7 @@ void ISOFileSystem::DoState(PointerWrap &p)
bool hasFile = of.file != NULL;
p.Do(hasFile);
if (hasFile) {
std::string path = "";
path = EntryFullPath(of.file);
std::string path = EntryFullPath(of.file);
p.Do(path);
}
}

4
Core/HLE/sceAtrac.cpp
View file

@ -1181,14 +1181,12 @@ u32 _AtracDecodeData(int atracID, u8 *outbuf, u32 outbufPtr, u32 *SamplesNum, u3
}
static u32 sceAtracDecodeData(int atracID, u32 outAddr, u32 numSamplesAddr, u32 finishFlagAddr, u32 remainAddr) {
int ret = -1;
// Note that outAddr being null is completely valid here, used to skip data.
u32 numSamples = 0;
u32 finish = 0;
int remains = 0;
ret = _AtracDecodeData(atracID, Memory::GetPointer(outAddr), outAddr, &numSamples, &finish, &remains);
int ret = _AtracDecodeData(atracID, Memory::GetPointer(outAddr), outAddr, &numSamples, &finish, &remains);
if (ret != (int)ATRAC_ERROR_BAD_ATRACID && ret != (int)ATRAC_ERROR_NO_DATA) {
if (Memory::IsValidAddress(numSamplesAddr))
Memory::Write_U32(numSamples, numSamplesAddr);

6
Core/HLE/sceNetAdhoc.cpp
View file

@ -260,8 +260,7 @@ static int sceNetAdhocPdpCreate(const char *mac, u32 port, int bufferSize, u32 u
//return ERROR_NET_ADHOC_PORT_IN_USE;
// Create Internet UDP Socket
int usocket = (int)INVALID_SOCKET;
usocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
int usocket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
// Valid Socket produced
if (usocket != INVALID_SOCKET) {
// Change socket buffer size when necessary
@ -1644,8 +1643,7 @@ static int sceNetAdhocPtpOpen(const char *srcmac, int sport, const char *dstmac,
// Valid Arguments
if (bufsize > 0 && rexmt_int > 0 && rexmt_cnt > 0) {
// Create Infrastructure Socket
int tcpsocket = (int)INVALID_SOCKET;
tcpsocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
int tcpsocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
// Valid Socket produced
if (tcpsocket > 0) {

6
UI/MiscScreens.cpp
View file

@ -87,10 +87,12 @@ void DrawBackground(UIContext &dc, float alpha = 1.0f) {
last_yres = yres;
}
int img = I_BG;
#ifdef GOLD
img = I_BG_GOLD;
int img = I_BG_GOLD;
#else
int img = I_BG;
#endif
ui_draw2d.DrawImageStretch(img, dc.GetBounds());
float t = time_now();
for (int i = 0; i < 100; i++) {

4
ext/native/ext/glew/glew.c
View file

@ -141,7 +141,6 @@ void* NSGLGetProcAddress (const GLubyte *name)
void* NSGLGetProcAddress (const GLubyte *name)
{
static const struct mach_header* image = NULL;
NSSymbol symbol;
char* symbolName;
if (NULL == image)
{
@ -151,10 +150,9 @@ void* NSGLGetProcAddress (const GLubyte *name)
symbolName = malloc(strlen((const char*)name) + 2);
strcpy(symbolName+1, (const char*)name);
symbolName[0] = '_';
symbol = NULL;
/* if (NSIsSymbolNameDefined(symbolName))
symbol = NSLookupAndBindSymbol(symbolName); */
symbol = image ? NSLookupSymbolInImage(image, symbolName, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR) : NULL;
NSSSymbol symbol = image ? NSLookupSymbolInImage(image, symbolName, NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR) : NULL;
free(symbolName);
if( symbol ) return NSAddressOfSymbol(symbol);
#ifdef GLEW_APPLE_GLX

2
ext/native/tools/atlastool.cpp
View file

@ -353,7 +353,7 @@ inline vector<CharRange> merge(const vector<CharRange> &a, const vector<CharRang
return result;
}
void RasterizeFonts(const FontReferenceList fontRefs, vector<CharRange> &ranges, float *metrics_height, Bucket *bucket) {
void RasterizeFonts(const FontReferenceList &fontRefs, vector<CharRange> &ranges, float *metrics_height, Bucket *bucket) {
FT_Library freetype;
CHECK(FT_Init_FreeType(&freetype) == 0);