qslim/fixes.diff

   1 diff -Naur qslim-2.1-old/libgfx/src/raster.cxx qslim-2.1-new/libgfx/src/raster.cxx
   2 --- qslim-2.1-old/libgfx/src/raster.cxx 2002-01-27 04:01:35.000000000 +0000
   3 +++ qslim-2.1-new/libgfx/src/raster.cxx 2008-05-28 06:19:10.000000000 +0100
   4 @@ -9,7 +9,7 @@
   5  #include <gfx/gfx.h>
   6  #include <gfx/raster.h>
   7
   8 -#include <string>
   9 +#include <cstring>
  10  #include <cctype>
  11
  12  ByteRaster::ByteRaster(const ByteRaster &img)
  13 diff -Naur qslim-2.1-old/mixkit/src/MxDynBlock.h qslim-2.1-new/mixkit/src/MxDynBlock.h
  14 --- qslim-2.1-old/mixkit/src/MxDynBlock.h       2004-07-01 19:38:41.000000000 +0100
  15 +++ qslim-2.1-new/mixkit/src/MxDynBlock.h       2008-05-28 06:28:51.000000000 +0100
  16 @@ -35,7 +35,7 @@
  17
  18      void room_for(int len)
  19      {
  20 -       if( length()<len ) resize(len);
  21 +       if( length()<len ) this->resize(len);
  22         fill = len;
  23      }
  24
  25 @@ -62,8 +62,8 @@
  26      //
  27      int size() const { return length(); }
  28
  29 -    typename MxBlock<T>::iterator end()       { return begin()+size(); }
  30 -    typename MxBlock<T>::const_iterator end() const { return begin()+size(); }
  31 +    typename MxBlock<T>::iterator end()       { return this->begin()+size(); }
  32 +    typename MxBlock<T>::const_iterator end() const { return this->begin()+size(); }
  33
  34      void push_back(const T& t) { add(t); }
  35  };
  36 diff -Naur qslim-2.1-old/mixkit/src/MxStack.h qslim-2.1-new/mixkit/src/MxStack.h
  37 --- qslim-2.1-old/mixkit/src/MxStack.h  2000-11-20 20:36:38.000000000 +0000
  38 +++ qslim-2.1-new/mixkit/src/MxStack.h  2008-05-28 06:31:34.000000000 +0100
  39 @@ -26,12 +26,12 @@
  40      MxStack(const T& val, unsigned int n) : MxDynBlock<T>(n)
  41         { push(val); }
  42
  43 -    T&       top()       { return last(); }
  44 -    const T& top() const { return last(); }
  45 +    T&       top()       { return this->last(); }
  46 +    const T& top() const { return this->last(); }
  47
  48 -    bool is_empty() { return length()==0; }
  49 +    bool is_empty() { return this->length()==0; }
  50
  51 -    T& pop() { return drop(); }
  52 +    T& pop() { return this->drop(); }
  53
  54      void push(const T& val) { add(val); }
  55      //
  56 @@ -41,7 +41,7 @@
  57      //       broken!  The top() will grab a pointer into the block,
  58      //       but the add() may reallocate the block before doing the
  59      //       assignment.  Thus, the pointer will become invalid.
  60 -    void push() { add(); top() = (*this)[length()-2]; }
  61 +    void push() { this->add(); top() = (*this)[this->length()-2]; }
  62  };
  63
  64  // MXSTACK_INCLUDED