* gl/dgobbi/stencildata-fixes:
  Consolidate vtkImageStencilData code, fix bugs.

Merge-request: !824

* gl/dgobbi/15647-PyObject-Wrapping:
  15647 Fix bug with wrapping PyObject args in Python.

Merge-request: !1213

The check for passthrough "PyObject *" args had an erroneous break
statement, which caused all further args to be ignored.

* gl/Xabi/release-6.3-fix-elevation-limit-case:
  Fix camera Elevation and Pitch if angle is 90

* gl/dgobbi/stencil-iterator-overrun-6.3:
  Fix a memory overrun in vtkImageStencilIterator.

If the stencil extent was smaller than the image extent, then the code
incremented the span list pointer upon reaching the first voxel within
the stencil extent, even though the pointer was already at the correct
location for the first voxel in the stencil extent.  The extra increment
could lead to a buffer overrun and unpredicable behavior resulting in
random crashes.

* gl/dgobbi/15934-meta-writer-update:
  Bug 15934: vtkMetaImageWriter incorrect voxel spacing and origin

The vtkMetaImageWriter's Write() method was getting the spacing and origin
from the input's data object before updating the data object.  As a result,
an incorrect spacing and origin was written to the file header.

* 6.3-osmesa-32:
  get a 3.2 context from OS mesa using new funcs

* gl/Xabi/release-6.3-vtkDelaunay2D-fixes:
  Fix a bug with vtkDelaunay2D.

Ken Martin authored 9 years ago and Ben Boeckel committed 9 years ago

Working with Brian Paul to get a 3.2 osmesa context
requires changes to VTK and 11.2 mesa changes to work

(cherry picked from commit e7e71c4e)

Joachim Pouderoux authored 9 years ago and Xabi committed 9 years ago

In a previous patch, a mechanism was added to check edges once
constrained edges were applied. However, in some cases, this
check can break some constrained edges.
This patch make sure to not perform this edge check for triangle
edges which contains a constrained edge.

(cherry picked from commit ac7a28f9)

This reverts commit 262fe1ef, reversing
changes made to 1a04e8a1.

* gl/gcasey/fix-macro-redefinition:
  Fix test compilation
  Fix macro redefinition errors

Move the offending macros to class-scope enums

* gl/dgobbi/python-py3k:
  Fixing bug from 5b6e9c49 with test inversion
  PyVTKObject: add .c_str()
  PyVTKObject: shorten the lifetime of the `s` object
  PyVTKObject: own the classname memory

* gl/Xabi/release-6.3-vtkDelaunay2D-fixes:
  Fix occasional failure of testing if a point is in or out of a triangle
  Fix a bad index issue that make constrained delaunay2d crash

Tokishiro Karasawa authored 9 years ago and Xabi committed 9 years ago

(cherry picked from commit 26fc6af6)

Joachim Pouderoux authored 9 years ago and Xabi committed 9 years ago

(cherry picked from commit b00e8680)

Ben Boeckel authored 9 years ago and David Gobbi committed 9 years ago

Seems GCC is happy without this?

Ben Boeckel authored 9 years ago and David Gobbi committed 9 years ago

It isn't needed after this point anymore.

Ben Boeckel authored 9 years ago and David Gobbi committed 9 years ago

In Python3, we take the actual object and construct a new bytes() object
from it. We then take a pointer to its data and decref the bytes object.
If the garbage collector runs between the decref and the use of the
classname variable further down, it is a use-after-free.

* gl/Xabi/release-6.3-mousewheel-pending-event:
  Return the MouseWheel event as a pending event in Win32 RenderWindow

Merge remote-tracking branch 'gl/Xabi/release-6.3-fix-doc-vtkimagedata-getdimensions' into release-6.3

* gl/Xabi/release-6.3-fix-doc-vtkimagedata-getdimensions:
  Fix the documentation for vtkImageData::GetDimensions

* gl/dgobbi/python-toupper-macro:
  Remove the toupper macro defined by Python.h.

The Python pyport.h header defines macros for toupper and other
ctype functions when compiled with __APPLE__ defined.  These macro
definitions are problematic for C++ in general, and cause compile
errors with modern compilers.

* gl/Xabi/release-6.3-double-win32Interactor-render:
  Remove the extra Render performed by the interactor on WM_PAINT.

It will be done in vtkWin32OpenGLRenderWindow

Merge remote-tracking branch 'gl/Xabi/release-6.3-win32-interactor-events-propagation' into release-6.3

* gl/Xabi/release-6.3-win32-interactor-events-propagation:
  Do not retain the windows events if they are not treated

(cherry picked from commit 3d9660ae)

There were some tricky bugs in the code for InsertAndMergeExtent() and
RemoveExtent(), so it seemed like a good opportunity to rewrite these
methods so that they share the same code.

Merge remote-tracking branch 'gl/Xabi/release-6.3-enable-DoubleClick-for-Win32OpenGLRenderWindow' into release-6.3

* gl/Xabi/release-6.3-enable-DoubleClick-for-Win32OpenGLRenderWindow:
  Set the CS_DBLCLKS  flag to receive double-click notifications

* gl/Xabi/release-6.3-picking_dp_fix:
  Another picking fix and mtime issue
  A fix for picking combined with depth peeling

* gl/dcthomp/fix-obj-texture-import:
  Add a regression test and baseline image.
  Handle OBJ-file materials without textures.

* commit '7d78e329':
  Remove Python version from vtkPythonConfigure.h.
  Fix HAVE_ROUND-related build warnings in Visual Studio 2013
  Fix const-cast warnings in vtkPythonInteractiveInterpreter.