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

Little fix (forbids pointer arithmetic in some places)

This commit is contained in:
Nekotekina 2014-08-14 16:15:04 +04:00
parent c9cd80c089
commit 9f0c5899d6
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rpcs3/Emu/Memory/Memory.h
View File

@ -657,15 +657,14 @@ public:
return false;
}
template<typename T> u8* operator + (const T vaddr)
template<typename T> void* operator + (const T vaddr)
{
u8* ret = GetMemFromAddr<T>(vaddr);
return ret;
return GetMemFromAddr<T>(vaddr);
}
template<typename T> u8& operator[] (const T vaddr)
{
return *(*this + vaddr);
return *GetMemFromAddr<T>(vaddr);
}
};

2
rpcs3/Emu/SysCalls/Modules/cellVdec.cpp
View File

@ -589,7 +589,7 @@ int cellVdecGetPicture(u32 handle, const mem_ptr_t<CellVdecPicFormat> format, u3
// TODO: zero padding bytes
int err = av_image_copy_to_buffer(Memory + out_addr, buf_size, frame.data, frame.linesize, vdec->ctx->pix_fmt, frame.width, frame.height, 1);
int err = av_image_copy_to_buffer(Memory.GetMemFromAddr(out_addr), buf_size, frame.data, frame.linesize, vdec->ctx->pix_fmt, frame.width, frame.height, 1);
if (err < 0)
{
cellVdec->Error("cellVdecGetPicture: av_image_copy_to_buffer failed(%d)", err);