diff options
| author | Nebuleon Fumika | 2013-02-08 05:50:22 -0500 |
|---|---|---|
| committer | Nebuleon Fumika | 2013-02-08 05:50:22 -0500 |
| commit | 927d456306672110870eb3386742c1c1ef8eb4f6 (patch) | |
| tree | 509da9ac1727570b02572068aefb9cdf102ad75b /source/clip.cpp | |
| parent | 433749b6ef1e2b070755c3bb7fc0d81b5ecaa7b1 (diff) | |
| parent | d4fcf2697c9a45594e3ee0b8bf82e480ddd0b69b (diff) | |
| download | snesemu-927d456306672110870eb3386742c1c1ef8eb4f6.tar.gz snesemu-927d456306672110870eb3386742c1c1ef8eb4f6.tar.bz2 snesemu-927d456306672110870eb3386742c1c1ef8eb4f6.zip | |
Merge branch 'master' into 8bitsound
Conflicts:
source/nds/entry.cpp
Diffstat (limited to 'source/clip.cpp')
| -rw-r--r-- | source/clip.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/clip.cpp b/source/clip.cpp index 57204ac..7147abf 100644 --- a/source/clip.cpp +++ b/source/clip.cpp @@ -291,7 +291,8 @@ void ComputeClipWindows () if (BAND_EMPTY(Win1[0])) { B = Window2Enabled; - memmove (Bands, Win2, + // memmove converted: Different stack allocations [Neb] + memcpy (Bands, Win2, sizeof(Win2[0]) * Window2Enabled); } else @@ -355,7 +356,8 @@ void ComputeClipWindows () // use window 1 as the clipping (which // could also be empty). B = Window1Enabled; - memmove (Bands, Win1, + // memmove converted: Different stack allocations [Neb] + memcpy (Bands, Win1, sizeof(Win1[0]) * Window1Enabled); } else @@ -468,14 +470,16 @@ void ComputeClipWindows () if (Window1Enabled == 1 && BAND_EMPTY(Win1[0])) { B = Window2Enabled; - memmove (Bands, Win2, + // memmove converted: Different stack allocations [Neb] + memcpy (Bands, Win2, sizeof(Win2[0]) * Window2Enabled); } else if (Window2Enabled == 1 && BAND_EMPTY(Win2[0])) { B = Window1Enabled; - memmove (Bands, Win1, + // memmove converted: Different stack allocations [Neb] + memcpy (Bands, Win1, sizeof(Win1[0]) * Window1Enabled); } else |