aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2015-07-07 20:16:00 +0200
committerOlaf Hering <olaf@aepfle.de>2015-07-08 08:19:12 +0200
commit1d20f7426a60ca6a88ac51a0f1ad4489e89af9b5 (patch)
treeca94e08429d97009b244ff5f1fac466b80a26fd1
parent3086956bdea7d8f11f65bdc0e2b1a27824c9c8f0 (diff)
[cximage]: use integers for arithmetic in CxImage::CheckFormat
ximaenc.cpp: In member function 'bool CxImage::CheckFormat(BYTE*, DWORD, DWORD)': ximaenc.cpp:1126:28: warning: NULL used in arithmetic [-Wpointer-arith] if (buffer==NULL || size==NULL){ Signed-off-by: Olaf Hering <olaf@aepfle.de>
-rw-r--r--lib/cximage-6.0/CxImage/ximaenc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cximage-6.0/CxImage/ximaenc.cpp b/lib/cximage-6.0/CxImage/ximaenc.cpp
index ed8b7799a7..63e18f923c 100644
--- a/lib/cximage-6.0/CxImage/ximaenc.cpp
+++ b/lib/cximage-6.0/CxImage/ximaenc.cpp
@@ -1123,7 +1123,7 @@ bool CxImage::CheckFormat(CxFile * hFile, DWORD imagetype)
////////////////////////////////////////////////////////////////////////////////
bool CxImage::CheckFormat(BYTE * buffer, DWORD size, DWORD imagetype)
{
- if (buffer==NULL || size==NULL){
+ if (buffer==NULL || size==0){
strcpy(info.szLastError,"invalid or empty buffer");
return false;
}