nvidia-texture-tools/issue139.patch

   1 Index: src/src/nvmath/Vector.h
   2 ===================================================================
   3 --- src/src/nvmath/Vector.h     (revision 8311)
   4 +++ src/src/nvmath/Vector.h     (working copy)
   5 @@ -68,7 +68,7 @@
   6         scalar y() const;
   7         scalar z() const;
   8
   9 -       const Vector2 & xy() const;
  10 +       Vector2 xy() const;
  11
  12         scalar component(uint idx) const;
  13
  14 @@ -111,8 +111,8 @@
  15         scalar z() const;
  16         scalar w() const;
  17
  18 -       const Vector2 & xy() const;
  19 -       const Vector3 & xyz() const;
  20 +       Vector2 xy() const;
  21 +       Vector3 xyz() const;
  22
  23         scalar component(uint idx) const;
  24
  25 @@ -231,9 +231,9 @@
  26  inline scalar Vector3::y() const { return m_y; }
  27  inline scalar Vector3::z() const { return m_z; }
  28
  29 -inline const Vector2 & Vector3::xy() const
  30 +inline Vector2 Vector3::xy() const
  31  {
  32 -       return *(Vector2 *)this;
  33 +       return Vector2(m_x, m_y);
  34  }
  35
  36  inline scalar Vector3::component(uint idx) const
  37 @@ -332,14 +332,14 @@
  38  inline scalar Vector4::z() const { return m_z; }
  39  inline scalar Vector4::w() const { return m_w; }
  40
  41 -inline const Vector2 & Vector4::xy() const
  42 +inline Vector2 Vector4::xy() const
  43  {
  44 -       return *(Vector2 *)this;
  45 +       return Vector2(m_x, m_y);
  46  }
  47
  48 -inline const Vector3 & Vector4::xyz() const
  49 +inline Vector3 Vector4::xyz() const
  50  {
  51 -       return *(Vector3 *)this;
  52 +       return Vector3(m_x, m_y, m_z);
  53  }
  54
  55  inline scalar Vector4::component(uint idx) const