Merge pull request #52 from zerhacken/vs2013-compiler-warnings

vs2013 compiler warnings
This commit is contained in:
baldurk committed 2014-05-08 20:16:36 +01:00
commit 3b4c2a909e
2 files changed
+3 -2

No files matched your search

+2 -1
View File
@@ -2,6 +2,7 @@
// Public domain, Rich Geldreich <richgel99@gmail.com>
// Alex Evans: Linear memory allocator (taken from jpge.h).
// v1.04, May. 19, 2012: Code tweaks to fix VS2008 static code analysis warnings (all looked harmless)
// changes from upstream, May. 5 2014: Fix harmless VC++ warning C4703
//
// Supports progressive and baseline sequential JPEG image files, and the most common chroma subsampling factors: Y, H1V1, H2V1, H1V2, and H2V2.
//
@@ -3088,7 +3089,7 @@ unsigned char *decompress_jpeg_image_from_stream(jpeg_decoder_stream *pStream, i
for (int y = 0; y < image_height; y++)
{
const uint8* pScan_line;
const uint8* pScan_line = NULL;
uint scan_line_len;
if (decoder.decode((const void**)&pScan_line, &scan_line_len) != JPGD_SUCCESS)
{
+1 -1
View File
@@ -244,7 +244,7 @@ void RenderDoc::RemoteAccessServerThread(void *s)
// receive handshake from client and get its name
{
PacketType type;
Serialiser *ser;
Serialiser *ser = NULL;
if(!RecvPacket(client, type, &ser))
{
SAFE_DELETE(ser);