[mupen64plus-video-glide64] 166/172: Imported Upstream version 2.0.0+33+g764d9fe
Sven Eckelmann
ecsv-guest at moszumanska.debian.org
Thu Nov 26 06:12:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-glide64.
commit 88aa51c4a65415c4a2875f7dd94dfb2c44a0fc67
Author: Sven Eckelmann <sven at narfation.org>
Date: Tue Apr 28 22:35:20 2015 +0200
Imported Upstream version 2.0.0+33+g764d9fe
---
projects/unix/Makefile | 0
src/3dmath.cpp | 0
src/3dmath.h | 0
src/Combine.cpp | 0
src/Combine.h | 0
src/Config.cpp | 0
src/Config.h | 0
src/Debugger.cpp | 0
src/DepthBufferRender.cpp | 0
src/Gfx1.3.h | 0
src/Ini.cpp | 0
src/Ini.h | 0
src/Main.cpp | 0
src/TexBuffer.cpp | 4 ++--
src/TexBuffer.h | 0
src/TexCache.cpp | 0
src/TexLoad16b.h | 4 ++++
src/TexLoad4b.h | 8 ++++++++
src/TexLoad8b.h | 10 +++++++++-
src/Util.cpp | 0
src/Util.h | 0
src/m64p.h | 0
src/osal_dynamiclib.h | 0
src/osal_dynamiclib_unix.c | 0
src/osal_dynamiclib_win32.c | 0
src/rdp.cpp | 0
src/rdp.h | 0
src/ucode06.h | 0
src/wrapper/main.cpp | 0
29 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/projects/unix/Makefile b/projects/unix/Makefile
old mode 100644
new mode 100755
diff --git a/src/3dmath.cpp b/src/3dmath.cpp
old mode 100755
new mode 100644
diff --git a/src/3dmath.h b/src/3dmath.h
old mode 100755
new mode 100644
diff --git a/src/Combine.cpp b/src/Combine.cpp
old mode 100755
new mode 100644
diff --git a/src/Combine.h b/src/Combine.h
old mode 100755
new mode 100644
diff --git a/src/Config.cpp b/src/Config.cpp
old mode 100755
new mode 100644
diff --git a/src/Config.h b/src/Config.h
old mode 100755
new mode 100644
diff --git a/src/Debugger.cpp b/src/Debugger.cpp
old mode 100755
new mode 100644
diff --git a/src/DepthBufferRender.cpp b/src/DepthBufferRender.cpp
old mode 100755
new mode 100644
diff --git a/src/Gfx1.3.h b/src/Gfx1.3.h
old mode 100755
new mode 100644
diff --git a/src/Ini.cpp b/src/Ini.cpp
old mode 100755
new mode 100644
diff --git a/src/Ini.h b/src/Ini.h
old mode 100755
new mode 100644
diff --git a/src/Main.cpp b/src/Main.cpp
old mode 100755
new mode 100644
diff --git a/src/TexBuffer.cpp b/src/TexBuffer.cpp
old mode 100755
new mode 100644
index f967c3f..4fa8b09
--- a/src/TexBuffer.cpp
+++ b/src/TexBuffer.cpp
@@ -297,7 +297,7 @@ BOOL OpenTextureBuffer(COLOR_IMAGE & cimage)
grRenderBuffer( GR_BUFFER_BACKBUFFER );
rdp.texbufs[i].count--;
if (j < rdp.texbufs[i].count)
- memcpy(&(rdp.texbufs[i].images[j]), &(rdp.texbufs[i].images[j+1]), sizeof(HIRES_COLOR_IMAGE)*(rdp.texbufs[i].count-j));
+ memmove(&(rdp.texbufs[i].images[j]), &(rdp.texbufs[i].images[j+1]), sizeof(HIRES_COLOR_IMAGE)*(rdp.texbufs[i].count-j));
}
}
}
@@ -599,7 +599,7 @@ BOOL FindTextureBuffer(DWORD addr, WORD width)
{
rdp.texbufs[index].count--;
if (j < rdp.texbufs[index].count)
- memcpy(&(rdp.texbufs[index].images[j]), &(rdp.texbufs[index].images[j+1]), sizeof(HIRES_COLOR_IMAGE)*(rdp.texbufs[index].count-j));
+ memmove(&(rdp.texbufs[index].images[j]), &(rdp.texbufs[index].images[j+1]), sizeof(HIRES_COLOR_IMAGE)*(rdp.texbufs[index].count-j));
}
}
}
diff --git a/src/TexBuffer.h b/src/TexBuffer.h
old mode 100755
new mode 100644
diff --git a/src/TexCache.cpp b/src/TexCache.cpp
old mode 100755
new mode 100644
diff --git a/src/TexLoad16b.h b/src/TexLoad16b.h
index cf98056..1fb3906 100644
--- a/src/TexLoad16b.h
+++ b/src/TexLoad16b.h
@@ -171,6 +171,8 @@ uint32_t Load16bRGBA (uint8_t *dst, uint8_t *src, int wid_64, int height, int li
if (wid_64 < 1) wid_64 = 1;
if (height < 1) height = 1;
int ext = (real_width - (wid_64 << 2)) << 1;
+ if (ext < 0)
+ return 0;
load16bRGBA(src, dst, wid_64, height, line, ext);
@@ -187,6 +189,8 @@ uint32_t Load16bIA (uint8_t *dst, uint8_t *src, int wid_64, int height, int line
if (wid_64 < 1) wid_64 = 1;
if (height < 1) height = 1;
int ext = (real_width - (wid_64 << 2)) << 1;
+ if (ext < 0)
+ return 0;
load16bIA(src, dst, wid_64, height, line, ext);
diff --git a/src/TexLoad4b.h b/src/TexLoad4b.h
index bfc2c09..f0f58b7 100644
--- a/src/TexLoad4b.h
+++ b/src/TexLoad4b.h
@@ -597,6 +597,8 @@ uint32_t Load4bCI (uint8_t *dst, uint8_t *src, int wid_64, int height, int line,
if (wid_64 < 1) wid_64 = 1;
if (height < 1) height = 1;
int ext = (real_width - (wid_64 << 4)) << 1;
+ if (ext < 0)
+ return 0;
if (rdp.tlut_mode == 0)
{
@@ -631,6 +633,9 @@ uint32_t Load4bIA (unsigned char * dst, unsigned char * src, int wid_64, int hei
if (wid_64 < 1) wid_64 = 1;
if (height < 1) height = 1;
int ext = (real_width - (wid_64 << 4));
+ if (ext < 0)
+ return 0;
+
load4bIA (src, dst, wid_64, height, line, ext);
return /*(0 << 16) | */GR_TEXFMT_ALPHA_INTENSITY_44;
}
@@ -646,6 +651,9 @@ uint32_t Load4bI (unsigned char * dst, unsigned char * src, int wid_64, int heig
if (wid_64 < 1) wid_64 = 1;
if (height < 1) height = 1;
int ext = (real_width - (wid_64 << 4));
+ if (ext < 0)
+ return 0;
+
load4bI (src, dst, wid_64, height, line, ext);
return /*(0 << 16) | */GR_TEXFMT_ALPHA_INTENSITY_44;
diff --git a/src/TexLoad8b.h b/src/TexLoad8b.h
index 3e35f96..a869a48 100644
--- a/src/TexLoad8b.h
+++ b/src/TexLoad8b.h
@@ -378,8 +378,10 @@ uint32_t Load8bCI (uint8_t *dst, uint8_t *src, int wid_64, int height, int line,
{
if (wid_64 < 1) wid_64 = 1;
if (height < 1) height = 1;
- int ext = (real_width - (wid_64 << 3));
unsigned short * pal = rdp.pal_8;
+ int ext = (real_width - (wid_64 << 3));
+ if (ext < 0)
+ return 0;
switch (rdp.tlut_mode) {
case 0: //palette is not used
@@ -411,6 +413,9 @@ uint32_t Load8bIA (uint8_t *dst, uint8_t *src, int wid_64, int height, int line,
if (wid_64 < 1) wid_64 = 1;
if (height < 1) height = 1;
int ext = (real_width - (wid_64 << 3));
+ if (ext < 0)
+ return 0;
+
load8bIA4 (src, dst, wid_64, height, line, ext);
return /*(0 << 16) | */GR_TEXFMT_ALPHA_INTENSITY_44;
}
@@ -428,6 +433,9 @@ uint32_t Load8bI (uint8_t *dst, uint8_t *src, int wid_64, int height, int line,
if (wid_64 < 1) wid_64 = 1;
if (height < 1) height = 1;
int ext = (real_width - (wid_64 << 3));
+ if (ext < 0)
+ return 0;
+
load8bI (src, dst, wid_64, height, line, ext);
return /*(0 << 16) | */GR_TEXFMT_ALPHA_8;
}
diff --git a/src/Util.cpp b/src/Util.cpp
old mode 100755
new mode 100644
diff --git a/src/Util.h b/src/Util.h
old mode 100755
new mode 100644
diff --git a/src/m64p.h b/src/m64p.h
old mode 100755
new mode 100644
diff --git a/src/osal_dynamiclib.h b/src/osal_dynamiclib.h
old mode 100755
new mode 100644
diff --git a/src/osal_dynamiclib_unix.c b/src/osal_dynamiclib_unix.c
old mode 100755
new mode 100644
diff --git a/src/osal_dynamiclib_win32.c b/src/osal_dynamiclib_win32.c
old mode 100755
new mode 100644
diff --git a/src/rdp.cpp b/src/rdp.cpp
old mode 100755
new mode 100644
diff --git a/src/rdp.h b/src/rdp.h
old mode 100755
new mode 100644
diff --git a/src/ucode06.h b/src/ucode06.h
old mode 100755
new mode 100644
diff --git a/src/wrapper/main.cpp b/src/wrapper/main.cpp
old mode 100755
new mode 100644
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-video-glide64.git
More information about the Pkg-games-commits
mailing list