Merge 'master' branch into V9_dev

diff --git a/src/Plugins/MEDReader/IO/module.cmake b/src/Plugins/MEDReader/IO/module.cmake
index 5363aad1a3e1cb0c675cd84ec7ae464f422aaeab..7ac6c48415b95a91e19ac9b6a3e64d33b8975f97 100644 (file)
--- a/src/Plugins/MEDReader/IO/module.cmake
+++ b/src/Plugins/MEDReader/IO/module.cmake
@@ -7,6 +7,5 @@ vtk_module(vtkMEDReader
     vtkRenderingCore
     vtkTestingRendering
     vtkInteractionStyle
-    #vtkRenderingFreeTypeOpenGL
   EXCLUDE_FROM_WRAP_HIERARCHY
 )

diff --git a/src/Plugins/MEDReader/Test/Baselines/testMEDReader0.png b/src/Plugins/MEDReader/Test/Baselines/testMEDReader0.png
index d4967f9265f6949f726f121057eca5ce2faa39fa..86ef73da486185829485d7723dac62e9076848f0 100644 (file)
Binary files a/src/Plugins/MEDReader/Test/Baselines/testMEDReader0.png and b/src/Plugins/MEDReader/Test/Baselines/testMEDReader0.png differ

diff --git a/src/Plugins/MEDReader/Test/Baselines/testMEDReader10.png b/src/Plugins/MEDReader/Test/Baselines/testMEDReader10.png
index 4bab2af8b1a7b04d86be219577d356052a0ea410..4f0907dfc6e36f51f6cafa5deb2f39ac72c2f0cf 100644 (file)
Binary files a/src/Plugins/MEDReader/Test/Baselines/testMEDReader10.png and b/src/Plugins/MEDReader/Test/Baselines/testMEDReader10.png differ

diff --git a/src/Plugins/MEDReader/Test/Baselines/testMEDReader11.png b/src/Plugins/MEDReader/Test/Baselines/testMEDReader11.png
index fdc1ac74b4b0806c48400824c2806b58abafbeba..cb584d1011f18084a713b25d42e579d42d41c6f4 100644 (file)
Binary files a/src/Plugins/MEDReader/Test/Baselines/testMEDReader11.png and b/src/Plugins/MEDReader/Test/Baselines/testMEDReader11.png differ

diff --git a/src/Plugins/MEDReader/Test/Baselines/testMEDReader2.png b/src/Plugins/MEDReader/Test/Baselines/testMEDReader2.png
index d4b019a5d478da01966a8cd242eecbdb367f50a5..3489d127a6d392bdaeddb1b305965f6d7d103303 100644 (file)
Binary files a/src/Plugins/MEDReader/Test/Baselines/testMEDReader2.png and b/src/Plugins/MEDReader/Test/Baselines/testMEDReader2.png differ

diff --git a/src/Plugins/MEDReader/Test/testMEDReader7.py b/src/Plugins/MEDReader/Test/testMEDReader7.py
index 61b5f18233510222576f4a9f681a478da0a9ad22..29c660fc51f7765805f1c596fd2960fd46fcf356 100644 (file)
--- a/src/Plugins/MEDReader/Test/testMEDReader7.py
+++ b/src/Plugins/MEDReader/Test/testMEDReader7.py
@@ -108,5 +108,5 @@ baseline_file = os.path.join(baselinePath, "testMEDReader7.png")
 import vtk.test.Testing
 vtk.test.Testing.VTK_TEMP_DIR = vtk.util.misc.vtkGetTempDir()
 vtk.test.Testing.compareImage(GetActiveView().GetRenderWindow(), baseline_file,
-                                                            threshold=1)
+                                                            threshold=6)
 vtk.test.Testing.interact()

diff --git a/test/standalone/gui/CMakeLists.txt b/test/standalone/gui/CMakeLists.txt
index e277b998ac8c15317dfd9e5b2669911e59b4390d..a0be32385b977791ad977c0592b390d5c2f64cfe 100644 (file)
--- a/test/standalone/gui/CMakeLists.txt
+++ b/test/standalone/gui/CMakeLists.txt
@@ -72,6 +72,6 @@ ADD_EXECUTABLE(paraLight
     ${pl_FORMS_HEADERS}
     ${rcs_sources})
     
-TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType vtkInteractionStyle)#vtkRenderingFreeTypeOpenGL)
+TARGET_LINK_LIBRARIES(paraLight ${QT_LIBRARIES} pqApplicationComponents vtkRenderingFreeType vtkInteractionStyle)
 #INSTALL(TARGET paraLight bin)