fix -Wall warnings

crengine/include/hyphman.h

@@ -178,7 +178,7 @@ class UserHyphDict
 {
 private:
  static lString32 _filename;
- static size_t _filesize;
+ static lvsize_t _filesize;
  static lUInt32 _hash_value; // for calculating rendering hashes
 
  static lUInt32 words_in_memory;

crengine/include/lvarray.h

@@ -130,10 +130,7 @@ class LVArray
  /// copies range to beginning of array
  void trim( int pos, int count, int reserved )
  {
-#if defined(_DEBUG) && !defined(ANDROID)
- if ( pos<0 || count<=0 || pos+count > _count )
- throw;
-#endif
+ assert(pos >= 0 && count > 0 && pos+count <= _count);
  int i;
  int new_sz = count;
  if (new_sz < reserved)
@@ -154,10 +151,7 @@ class LVArray
  /// removes several items from vector
  void erase( int pos, int count )
  {
-#if defined(_DEBUG) && !defined(ANDROID)
- if ( pos<0 || count<=0 || pos+count > _count )
- throw;
-#endif
+ assert(pos >= 0 && count > 0 && pos+count <= _count);
  int i;
  for (i=pos+count; i<_count; i++)
  {

crengine/include/lvptrvec.h

@@ -267,7 +267,7 @@ template<class _Ty > class LVMatrix {
  int numrows;
  _Ty ** rows;
 public:
- LVMatrix<_Ty> () : numcols(0), numrows(0), rows(NULL) {}
+ LVMatrix () : numcols(0), numrows(0), rows(NULL) {}
  void Clear() {
  if (rows) {
  if (numrows && numcols) {
@@ -280,7 +280,7 @@ template<class _Ty > class LVMatrix {
  numrows = 0;
  numcols = 0;
  }
- ~LVMatrix<_Ty> () {
+ ~LVMatrix () {
  Clear();
  } 
 

crengine/include/lvref.h

@@ -19,6 +19,7 @@
 #ifndef __LVREF_H_INCLUDED__
 #define __LVREF_H_INCLUDED__
 
+#include <cassert>
 #include "lvtypes.h"
 #include "lvmemman.h"
 #include "crlocks.h"
@@ -387,13 +388,15 @@ template <class T> class LVRef
  //========================================
 public:
 
+#if 0
  /// creates reference to copy
  LVRef & clone()
  {
  if ( isNull() )
  return LVRef(NULL);
  return LVRef( new T( *_ptr ) );
  }
+#endif
 
  /// Default constructor.
  /** Initializes pointer to NULL */
@@ -592,8 +595,7 @@ class LVRefVec
  /// copies range to beginning of array
  void trim( int pos, int count, int reserved )
  {
- if ( pos<0 || count<=0 || pos+count > _count )
- throw;
+ assert(pos >= 0 && count > 0 && pos+count <= _count);
  int i;
  int new_sz = count;
  if (new_sz < reserved)
@@ -614,8 +616,7 @@ class LVRefVec
  /// removes several items from vector
  void erase( int pos, int count )
  {
- if ( pos<0 || count<=0 || pos+count > _count )
- throw;
+ assert(pos >= 0 && count > 0 && pos+count <= _count);
  int i;
  for (i=pos+count; i<_count; i++)
  {

crengine/include/lvtinydom.h

@@ -2052,7 +2052,7 @@ class ldomXRange {
  /// returns true if this interval intersects specified interval
  bool checkIntersection( ldomXRange & v );
  /// returns text between two XPointer positions
- lString32 getRangeText( lChar32 blockDelimiter='\n', int maxTextLen=0, lChar32 imageReplacement=0, LVArray<ldomNode*> * imageNodes=NULL);
+ lString32 getRangeText( lChar32 blockDelimiter='\n', lChar32 imageReplacement=0, LVArray<ldomNode*> * imageNodes=NULL);
  /// get all words from specified range
  void getRangeWords( LVArray<ldomWord> & list );
  /// returns href attribute of <A> element, null string if not found

crengine/qimagescale/qimagescale.cpp

@@ -272,6 +272,8 @@ static QImageScaleInfo* QImageScale::qimageCalcScaleInfo(const unsigned char* __
 }
 
 
+#if defined(FBINK_QIS_NO_SIMD) || (!defined(__SSE4_1__) && !defined(__ARM_NEON__))
+
 static void qt_qimageScaleAARGBA_up_x_down_y(QImageScaleInfo *isi, unsigned int * __restrict dest,
  int dw, int dh, int dow, int sow);
 
@@ -281,6 +283,8 @@ static void qt_qimageScaleAARGBA_down_x_up_y(QImageScaleInfo *isi, unsigned int
 static void qt_qimageScaleAARGBA_down_xy(QImageScaleInfo *isi, unsigned int * __restrict dest,
  int dw, int dh, int dow, int sow);
 
+#endif
+
 #ifndef FBINK_QIS_NO_SIMD
 #if defined(__SSE4_1__)
 template<bool RGB>
@@ -397,6 +401,8 @@ static void qt_qimageScaleAARGBA(QImageScaleInfo *isi, unsigned int * __restrict
  }
 }
 
+#if defined(FBINK_QIS_NO_SIMD) || (!defined(__SSE4_1__) && !defined(__ARM_NEON__))
+
 inline static void qt_qimageScaleAARGBA_helper(const unsigned int * __restrict pix, const int xyap, const int Cxy, const int step, int &r, int &g, int &b, int &a)
 {
  r = qRed(*pix) * xyap;
@@ -553,6 +559,8 @@ static void qt_qimageScaleAARGB_down_x_up_y(QImageScaleInfo *isi, unsigned int *
 static void qt_qimageScaleAARGB_down_xy(QImageScaleInfo *isi, unsigned int * __restrict dest,
  int dw, int dh, int dow, int sow);
 
+#endif
+
 /* scale by area sampling - IGNORE the ALPHA byte*/
 static void qt_qimageScaleAARGB(QImageScaleInfo *isi, unsigned int * __restrict dest,
  int dw, int dh, int dow, int sow)
@@ -606,6 +614,8 @@ static void qt_qimageScaleAARGB(QImageScaleInfo *isi, unsigned int * __restrict
 }
 
 
+#if defined(FBINK_QIS_NO_SIMD) || (!defined(__SSE4_1__) && !defined(__ARM_NEON__))
+
 inline static void qt_qimageScaleAARGB_helper(const unsigned int * __restrict pix, const int xyap, const int Cxy, const int step, int &r, int &g, int &b)
 {
  r = qRed(*pix) * xyap;
@@ -743,6 +753,8 @@ static void qt_qimageScaleAARGB_down_xy(QImageScaleInfo *isi, unsigned int * __r
  }
 }
 
+#endif
+
 unsigned char* qSmoothScaleImage(const unsigned char* __restrict src, int sw, int sh, bool ignore_alpha, int dw, int dh)
 {
  unsigned char* __restrict buffer = nullptr;

crengine/src/cp_stats.cpp

@@ -562,6 +562,7 @@ static const dbl_char_stat_t dbl_ch_stat_cp1250_cs1[256] = {
 };
 
 
+#if 0
 
 static const short ch_stat_iso8859_2_cs2[256]={
 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,// 0..15
@@ -601,6 +602,7 @@ static const dbl_char_stat_t dbl_ch_stat_iso8859_2_cs2[256] = {
 {0xec,0x6a,0x0025}, {0xec,0x6b,0x0023}, {0xec,0x6c,0x0051}, {0xec,0x74,0x001d}, {0xed,0x20,0x00d8}, {0xed,0x63,0x0029}, {0xed,0x6b,0x002f}, {0xed,0x6d,0x0041}, {0xed,0x74,0x0024}, {0xf8,0x65,0x0087}, {0xf8,0x69,0x0045}, {0xf8,0xed,0x003c}, {0xf9,0x20,0x0027}, {0xfd,0x20,0x0060}, {0xfd,0x63,0x001d}, {0xfd,0x6d,0x0020}, // 240..255
 };
 
+#endif
 
 
 static const short ch_stat_cp1250_pl1[256]={

crengine/src/cri18n.cpp

@@ -45,13 +45,11 @@ const char * CRI18NTranslator::translate( const char * src )
  }
  return src; // return untranslated
  }
- const char * res = src;
 #if CR_EMULATE_GETTEXT==1
- res = src;
  CRLog::trace("translation is not supported. returning source string: %s", src);
  return src;
 #else
- res = gettext(src);
+ const char * res = gettext(src);
  CRLog::trace("gettext(%s) is %s", src, res);
  return res;
 #endif

crengine/src/crtxtenc.cpp

@@ -1697,7 +1697,7 @@ class CDoubleCharStat2
  pData[k].count = 0;
  }
  }
- delete[] pdata;
+ delete[] pdata; // cppcheck-suppress uninitdata
  Close();
  }
 
@@ -2070,10 +2070,11 @@ void MakeStatsForFile( const char * fname, const char * cp_name, const char * la
  if (!in)
  return;
  fseek( in, 0, SEEK_END );
- int buf_size = ftell(in);
+ long buf_size = ftell(in);
  fseek( in, 0, SEEK_SET );
  unsigned char * buf = new unsigned char[buf_size];
- if ( fread(buf, 1, buf_size, in) != buf_size ) {
+ if ( (long)fread(buf, 1, buf_size, in) != buf_size ) {
+ delete [] buf;
  fclose(in);
  return;
  }