diff --git a/WorkDir/webui/debugger.html b/WorkDir/webui/debugger.html
index 241b4e998..13a738b6c 100644
--- a/WorkDir/webui/debugger.html
+++ b/WorkDir/webui/debugger.html
@@ -302,10 +302,9 @@ function reset() {
}
socket_lm.onmessage =function got_packet(msg) {
- j = msg.data.split(';');
- f = 0;
+ var j = msg.data.split(';'), f = 0;
while (f < j.length - 1) {
- i = j[f].split(' ');
+ var i = j[f].split(' ');
if (i[0] == 'd') {
ctx.strokeStyle = i[1];
ctx.beginPath();
diff --git a/core/imgread/chd.cpp b/core/imgread/chd.cpp
index 3e99c285b..df9bd45c9 100644
--- a/core/imgread/chd.cpp
+++ b/core/imgread/chd.cpp
@@ -140,7 +140,7 @@ bool CHDDisc::TryOpen(const wchar* file)
if (total_frames!=549300 || tracks.size()<3)
{
- printf("WARNING: chd: Total frames is wrong: %d frames in %d tracks\n",total_frames,tracks.size());
+ printf("WARNING: chd: Total frames is wrong: %u frames in %u tracks\n",total_frames,tracks.size());
#ifndef NOT_REICAST
msgboxf("This is an improper dump!",MBX_ICONEXCLAMATION);
#endif
diff --git a/core/imgread/common.cpp b/core/imgread/common.cpp
index 0984ef65b..3a08a564c 100644
--- a/core/imgread/common.cpp
+++ b/core/imgread/common.cpp
@@ -243,7 +243,7 @@ bool DiscSwap(u32 fileflags)
printf("Loading default image \"%s\"\n",settings.imgread.DefaultImage);
if (!InitDrive_(settings.imgread.DefaultImage))
{
- msgboxf("Default image \"%s\" failed to load",MBX_ICONERROR);
+ msgboxf("Default image \"%s\" failed to load",MBX_ICONERROR,settings.imgread.DefaultImage);
return false;
}
else
diff --git a/core/linux/common.cpp b/core/linux/common.cpp
index 8830668af..0d51363ea 100644
--- a/core/linux/common.cpp
+++ b/core/linux/common.cpp
@@ -330,7 +330,7 @@ void common_linux_setup()
settings.profile.run_counts=0;
- printf("Linux paging: %08X %08X %08X\n",sysconf(_SC_PAGESIZE),PAGE_SIZE,PAGE_MASK);
+ printf("Linux paging: %ld %08X %08X\n",sysconf(_SC_PAGESIZE),PAGE_SIZE,PAGE_MASK);
verify(PAGE_MASK==(sysconf(_SC_PAGESIZE)-1));
}
#endif
diff --git a/core/rend/gles/gles.cpp b/core/rend/gles/gles.cpp
index 4bc9638d1..d8ec2823f 100755
--- a/core/rend/gles/gles.cpp
+++ b/core/rend/gles/gles.cpp
@@ -746,8 +746,6 @@ GLuint gl_CompileShader(const char* shader,GLuint type)
if (!result && compile_log_len>0)
{
- if (compile_log_len==0)
- compile_log_len=1;
char* compile_log=(char*)malloc(compile_log_len);
*compile_log=0;
@@ -791,8 +789,6 @@ GLuint gl_CompileAndLink(const char* VertexShader, const char* FragmentShader)
if (!result && compile_log_len>0)
{
- if (compile_log_len==0)
- compile_log_len=1;
compile_log_len+= 1024;
char* compile_log=(char*)malloc(compile_log_len);
*compile_log=0;
@@ -1035,7 +1031,7 @@ void tryfit(float* x,float* y)
int rep=1;
//discard values clipped to 0 or 1
- if (i<128 && y[i]==1 && y[i+1]==1)
+ if (y[i]==1 && y[i+1]==1)
continue;
if (i>0 && y[i]==0 && y[i-1]==0)
@@ -1045,7 +1041,7 @@ void tryfit(float* x,float* y)
if (i>0 && y[i]!=1 && y[i-1]==1)
rep=10000;
- if (i<128 && y[i]!=0 && y[i+1]==0)
+ if (y[i]!=0 && y[i+1]==0)
rep=10000;
for (int j=0;j