From 43f2c99b1e1f826d2c1c78b97aef4798bd56398c Mon Sep 17 00:00:00 2001 From: David Sarrut Date: Fri, 2 Jun 2017 13:03:53 +0200 Subject: [PATCH] remove warning --- utilities/CxImage/ximaenc.cpp | 2 +- utilities/CxImage/ximagif.cpp | 26 +++++++++++++------------- utilities/CxImage/ximaint.cpp | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/utilities/CxImage/ximaenc.cpp b/utilities/CxImage/ximaenc.cpp index 8edfbfc..4f095fe 100644 --- a/utilities/CxImage/ximaenc.cpp +++ b/utilities/CxImage/ximaenc.cpp @@ -996,7 +996,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; } diff --git a/utilities/CxImage/ximagif.cpp b/utilities/CxImage/ximagif.cpp index 740717c..0c89759 100644 --- a/utilities/CxImage/ximagif.cpp +++ b/utilities/CxImage/ximagif.cpp @@ -718,8 +718,8 @@ void CxImageGIF::Putword(int w, CxFile *fp ) //////////////////////////////////////////////////////////////////////////////// void CxImageGIF::compressNONE( int init_bits, CxFile* outfile) { - register long c; - register long ent; + long c; + long ent; // g_init_bits - initial number of bits // g_outfile - pointer to output file @@ -766,12 +766,12 @@ void CxImageGIF::compressNONE( int init_bits, CxFile* outfile) void CxImageGIF::compressLZW( int init_bits, CxFile* outfile) { - register long fcode; - register long c; - register long ent; - register long hshift; - register long disp; - register long i; + long fcode; + long c; + long ent; + long hshift; + long disp; + long i; // g_init_bits - initial number of bits // g_outfile - pointer to output file @@ -891,10 +891,10 @@ void CxImageGIF::output( code_int code) void CxImageGIF::cl_hash(long hsize) { - register long *htab_p = htab+hsize; + long *htab_p = htab+hsize; - register long i; - register long m1 = -1L; + long i; + long m1 = -1L; i = hsize - 16; @@ -1061,9 +1061,9 @@ short CxImageGIF::get_next_code(CxFile* file) */ short CxImageGIF::decoder(CxFile* file, CImageIterator* iter, short linewidth, int &bad_code_count) { - register BYTE *sp, *bufptr; + BYTE *sp, *bufptr; BYTE *buf; - register short code, fc, oc, bufcnt; + short code, fc, oc, bufcnt; short c, size, ret; /* Initialize for decoding a new image... */ diff --git a/utilities/CxImage/ximaint.cpp b/utilities/CxImage/ximaint.cpp index 989d76c..c30e882 100644 --- a/utilities/CxImage/ximaint.cpp +++ b/utilities/CxImage/ximaint.cpp @@ -853,7 +853,7 @@ float CxImage::KernelBessel_J1(const float x) { double p, q; - register long i; + long i; static const double Pone[] = @@ -895,7 +895,7 @@ float CxImage::KernelBessel_P1(const float x) { double p, q; - register long i; + long i; static const double Pone[] = @@ -931,7 +931,7 @@ float CxImage::KernelBessel_Q1(const float x) { double p, q; - register long i; + long i; static const double Pone[] = -- 2.47.1