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)

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)

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.

Merge remote-tracking branch 'gl/Xabi/release-6.3-fixes_for_depth_peeling_compositing' into release-6.3

* gl/Xabi/release-6.3-fixes_for_depth_peeling_compositing:
  A depth peeling fix when compositing

* gl/Xabi/release-6.3-clear_polygon_offset:
  Fix issue with polygon offset being left on

Ken Martin authored 9 years ago and Xabi committed 9 years ago

Fix old style prop picking without hardware selector

Fix missing mtime check on OpenGLPolyDataMapper2D

(cherry picked from commit 95d0ef05)

Ken Martin authored 9 years ago and Xabi committed 9 years ago

A fix for picking combined with depth peeling and some cleanup.
Picking (not using a hardware picker) was not clearing the
LastRenderingUsedDepth peelign flag and that was causing issues.
Switched to that that flag is not sued but instead the information
objects are used.

(cherry picked from commit 7e23fd65)

When compositing we need the alpha to be correct when it
comes out of depth peeling. Previously it was being set
to 1.0.

(cherry picked from commit ab9d8eb8)

Fix a case where the polygon offset could be left on

(cherry picked from commit ce137831)

when registering the window class.

* gl/dgobbi/python-py3k:
  Convert the PythonInterpreter module for Python 3.
  Fix for Python 3.5 compilation on Linux, Win32.

This is no longer needed, and is needlessly restrictive.
It's best to have a header that can be used by multiple
versions of python.

Max Smolens authored 9 years ago and David Gobbi committed 9 years ago

When built with certain versions of Python, a VTK build with
VTK_WRAP_PYTHON enabled results in many build warnings. For example:

Python 2.7.10:

    c:\python27\include\pyconfig.h(444): warning C4005: 'HAVE_ROUND' : macro redefinition
              C:\dev\VTK\Utilities\Python\vtkPython.h(77) : see previous definition of 'HAVE_ROUND'

This warning occurs because both vtkPython.h and Python.h define the
HAVE_ROUND macro, but the definitions don't match. Python 2.7.9+ and
Python 3.4.2+ define HAVE_ROUND when compiling with Visual Studio 2013+
(see http://bugs.python.org/issue21958).

Python 3.4.1:

    c:\python34\include\pymath.h(22): warning C4273: 'round' : inconsistent dll linkage
              C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\math.h(516) : see previous definition of 'round'
    C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\xtgmath.h(206): warning C4273: 'round' : inconsistent dll linkage
              C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\include\math.h(516) : see previous definition of 'round'

This warning occurs because neither Python.h nor vtkPython.h define HAVE_ROUND.

This commit removes the build warnings by:
- changing the HAVE_ROUND macro definition to match Python's definition
- removing the Python version check

Utkarsh Ayachit authored 9 years ago and David Gobbi committed 9 years ago

PySys_GetObject/SetObject API continues to take char*  (instead of
const char*) till Python 3.4. Hence we need to use const_cast to avoid
warnings.

This module was missed in the first round of Python 3 compatibility
fixes.

In Python 3.5, they finally created a public function to convert
strings from local encoding to wchar_t unicode.  The old internal
function _Py_char2wchar() has been replaced by Py_DecodeLocale(),
which also handles UTF-16 surrogates for OS X.