summaryrefslogtreecommitdiffhomepage
path: root/nGenEx
diff options
context:
space:
mode:
authorFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2012-05-27 09:39:31 +0000
committerFWoltermann@gmail.com <FWoltermann@gmail.com@076cb2c4-205e-83fd-5cf3-1be9aa105544>2012-05-27 09:39:31 +0000
commit03b1d6b74d13dd51a53d2531becb4137b96fa1ed (patch)
tree7268e27a4f905c0972c738016758bd1a97deae37 /nGenEx
parente13cda27515a6a528a515e41ddd97a116bf80da3 (diff)
downloadstarshatter-03b1d6b74d13dd51a53d2531becb4137b96fa1ed.zip
starshatter-03b1d6b74d13dd51a53d2531becb4137b96fa1ed.tar.gz
starshatter-03b1d6b74d13dd51a53d2531becb4137b96fa1ed.tar.bz2
A few things MSVC's analyzer found.
Diffstat (limited to 'nGenEx')
-rw-r--r--nGenEx/Archive.cpp1
-rw-r--r--nGenEx/AviFile.cpp1
-rw-r--r--nGenEx/Bitmap.cpp1
-rw-r--r--nGenEx/Sound.cpp2
4 files changed, 4 insertions, 1 deletions
diff --git a/nGenEx/Archive.cpp b/nGenEx/Archive.cpp
index cd93640..689ac10 100644
--- a/nGenEx/Archive.cpp
+++ b/nGenEx/Archive.cpp
@@ -223,6 +223,7 @@ void DataArchive::LoadDatafile(const char* name)
fread(dirbuf, header.dir_size_comp, 1, f);
int err = uncompress((BYTE*) directory, &len,
+#pragma warning(suppress: 6029)
dirbuf, header.dir_size_comp);
if (err != Z_OK)
ZeroMemory(directory, sizeof(DataEntry) * dirsize);
diff --git a/nGenEx/AviFile.cpp b/nGenEx/AviFile.cpp
index b9c092b..931765d 100644
--- a/nGenEx/AviFile.cpp
+++ b/nGenEx/AviFile.cpp
@@ -151,6 +151,7 @@ AviFile::AddFrame(const Bitmap& bmp)
}
}
+#pragma warning(suppress: 6001)
hr = AVIStreamWrite(ps_comp, nframe, 1, buffer, frame_size, AVIIF_KEYFRAME, 0, 0);
if (SUCCEEDED(hr)) {
diff --git a/nGenEx/Bitmap.cpp b/nGenEx/Bitmap.cpp
index d192d7c..819a083 100644
--- a/nGenEx/Bitmap.cpp
+++ b/nGenEx/Bitmap.cpp
@@ -231,6 +231,7 @@ Bitmap::BitBlt(int x, int y, const Bitmap& srcBmp, int sx, int sy, int w, int h,
Color* src = srcBmp.HiPixels() + (sy*spitch) + sx;
for (int i = 0; i < h; i++) {
+#pragma warning(suppress: 28183)
memcpy(dst, src, rowlen);
dst += dpitch;
src += spitch;
diff --git a/nGenEx/Sound.cpp b/nGenEx/Sound.cpp
index 49fdb65..8de0350 100644
--- a/nGenEx/Sound.cpp
+++ b/nGenEx/Sound.cpp
@@ -113,7 +113,7 @@ Sound::CreateStream(const char* filename)
break;
default:
- delete buf;
+ delete[] buf;
return sound;
}
}