Commit 67d89515 authored by Ken Martin's avatar Ken Martin
Browse files

updates from the main tree

parent e5d94fda
......@@ -71,7 +71,7 @@ SET(CTEST_CUSTOM_WARNING_EXCEPTION
"warning LNK4221"
"variable .var_args[2]*. is used before its value is set"
"jobserver unavailable"
"warning: (Long double usage is reported only once for each file"
"warning: \\(Long double usage is reported only once for each file"
"warning: To disable this warning use"
"ranlib: file: .+ has no symbols"
)
......
......@@ -2541,7 +2541,6 @@
Memcheck:Cond
fun:__stpcpy
obj:/lib/libc-2.3.3.so
fun:__sysconf
}
{
<insert a suppression name here>
......@@ -2550,3 +2549,589 @@
obj:/usr/X11R6/lib/libXt.so.6.0
fun:_XtGetResources
}
{
<insert a suppression name here>
Memcheck:Cond
fun: strlen
obj:/lib/libc-2.3.3.so
fun:_dl_catch_error_internal
}
{
<insert a suppression name here>
Memcheck:Cond
fun:strchr
fun:__glXGetCurrentContext
}
{
<insert a suppression name here>
Memcheck:Cond
fun:_dl_relocate_object_internal
obj:/lib/tls/libc-2.3.3.so
fun:_dl_catch_error_internal
fun:_dl_open
obj:/lib/libdl-2.3.3.so
fun:_dl_catch_error_internal
obj:/lib/libdl-2.3.3.so
fun:dlopen
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_XlcDynamicLoad
fun:_XOpenLC
fun:_XlcCurrentLC
fun:XSetLocaleModifiers
}
{
<insert a suppression name here>
Memcheck:Param
writev(vector[...])
fun:writev
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_X11TransWritev
fun:_XSend
obj:/usr/X11R6/lib/libX11.so.6.2
fun:XPutImage
fun:DitherInstance
fun:Tk_DitherPhoto
fun:Tk_PhotoPutBlock
}
{
<insert a suppression name here>
Memcheck:Param
write(buf)
fun:write
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_X11TransWrite
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_XFlush (in /usr/X11R6/lib/libX11.so.6.2)
obj:/usr/X11R6/lib/libX11.so.6.2
fun:XPutImage
fun:DitherInstance
fun:ImgPhotoConfigureInstance
fun:ImgPhotoGet
fun:Tk_GetImage
fun:ConfigureButton
}
{
<insert a suppression name here>
Memcheck:Addr4
obj:/lib/tls/libc-2.3.3.so
obj:/lib/tls/libc-2.3.3.so
obj:/lib/tls/libc-2.3.3.so
obj:/lib/tls/libc-2.3.3.so
obj:/lib/tls/libc-2.3.3.so
fun:__libc_freeres
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
obj:/usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2
fun:_XimOpenIM
obj:/usr/X11R6/lib/libX11.so.6.2
fun:XOpenIM
fun:OpenIM
fun:TkpOpenDisplay
fun:GetScreen
fun:CreateTopLevelWindow
fun:TkCreateMainWindow
fun:CreateFrame
fun:TkCreateFrame
fun:Initialize
fun:Tk_Init
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:get_dispatch
fun:glXChooseVisual
fun:_Z34vtkXOpenGLRenderWindowTryForVisualP9_XDisplayiiii
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
obj:/usr/X11R6/lib/libXcursor.so.1.0
fun:XcursorTryShapeCursor
fun:_XTryShapeCursor
fun:XCreateGlyphCursor
fun:TkGetCursorByName
fun:TkcGetCursor
fun:Tk_AllocCursorFromObj
fun:DoObjConfig
fun:Tk_InitOptions
fun:fun:MenuCmd
fun:TclEvalObjvInternal
fun:Tcl_EvalEx
fun:Tcl_Eval
fun:Tcl_GlobalEval
}
{
<insert a suppression name here>
Memcheck:Leak
fun:calloc
obj:/lib/libdl-2.3.3.so
fun:dlsym
fun:open64
fun:TclpOpenFileChannel
fun:Tcl_FSOpenFileChannel
fun:OpenEncodingFile
fun:LoadEncodingFile
fun:Tcl_GetEncoding
fun:Tcl_SetSystemEncoding
fun:TclpSetInitialEncodings
fun:TclFindEncodings
fun:Tcl_FindExecutable
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:open_path
fun:_dl_map_object_internal
obj:/lib/tls/libc-2.3.3.so
fun:_dl_catch_error_internal
fun:_dl_open
obj:/lib/libdl-2.3.3.so
fun:_dl_catch_error_internal
obj:/lib/libdl-2.3.3.so
fun:dlopen
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_XNoticeCreateBitmap
fun:XCreatePixmap
fun:XCreateBitmapFromData
fun:GetBitmap
fun:Tk_GetBitmap
fun:TkButtonWorldChanged
fun:ConfigureButton
fun:ButtonCreate
fun:Tk_ButtonObjCmd
fun:TclEvalObjvInternal
fun:TclExecuteByteCode
fun:TclCompEvalObj
fun:TclObjInterpProc
fun:TclEvalObjvInternal
fun:TclExecuteByteCode
fun:TclCompEvalObj
fun:Tcl_EvalObjEx
fun:NamespaceEvalCmd
fun:Tcl_NamespaceObjCmd
fun:TclEvalObjvInternal
fun:Tcl_EvalEx
fun:Tcl_Eval
fun:Tcl_GlobalEval
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
obj:/usr/X11R6/lib/libX11.so.6.2
fun:XQueryFont
obj:/usr/X11R6/lib/libXcursor.so.1.0
fun:XcursorTryShapeCursor
fun:_XTryShapeCursor
fun:XCreateGlyphCursor
fun:TkGetCursorByName
fun:TkcGetCursor
fun:Tk_AllocCursorFromObj
fun:DoObjConfig
fun:Tk_InitOptions
fun:MenuCmd
fun:TclEvalObjvInternal
fun:Tcl_EvalEx
fun:Tcl_Eval
fun:Tcl_GlobalEval
}
{
<insert a suppression name here>
Memcheck:Leak
fun:calloc
fun:XShmCreateImage
fun:alloc_shm_back_buffer
fun:xmesa_alloc_back_buffer
fun:xmesa_resize_buffers
fun:_mesa_ResizeBuffersMESA
fun:_mesa_set_viewport
fun:_mesa_Viewport
fun:glViewport
}
{
<insert a suppression name here>
Memcheck:Leak
fun:calloc
fun:XCreateImage
fun:initialize_visual_and_buffer
fun:XMesaCreateWindowBuffer2
fun:Fake_glXMakeContextCurrent
fun:Fake_glXMakeCurrent
fun:glXMakeCurrent
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:_dl_map_object_internal
obj:/lib/tls/libc-2.3.3.so
fun:_dl_catch_error_internal
fun:_dl_open
obj:/lib/libdl-2.3.3.so
fun:_dl_catch_error_internal
obj:/lib/libdl-2.3.3.so
fun:dlopen
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_XlcDynamicLoad
fun:_XOpenLC
fun:_XlcCurrentLC
fun:XSetLocaleModifiers
fun:OpenIM
fun:TkpOpenDisplay
fun:GetScreen
fun:CreateTopLevelWindow
fun:TkCreateMainWindow
fun:CreateFrame
fun:TkCreateFrame
fun:Initialize
fun:Tk_Init
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:_dl_map_object_deps_internal
obj:/lib/tls/libc-2.3.3.so
fun:_dl_catch_error_internal
fun:_dl_open
obj:/lib/libdl-2.3.3.so
fun:_dl_catch_error_internal
obj:/lib/libdl-2.3.3.so
fun:dlopen
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_XNoticeCreateBitmap
fun:XCreatePixmap
fun:XCreateBitmapFromData
fun:GetBitmap
fun:Tk_GetBitmap
fun:TkButtonWorldChanged
fun:ConfigureButton
fun:ButtonCreate
fun:Tk_ButtonObjCmd
fun:TclEvalObjvInternal
fun:TclExecuteByteCode
fun:TclCompEvalObj
fun:TclObjInterpProc
fun:TclEvalObjvInternal
fun:TclExecuteByteCode
fun:TclCompEvalObj
fun:Tcl_EvalObjEx
fun:NamespaceEvalCmd
fun:Tcl_NamespaceObjCmd
fun:TclEvalObjvInternal
fun:Tcl_EvalEx
fun:Tcl_Eval
fun:Tcl_GlobalEval
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:_dl_map_object_deps_internal
obj:/lib/tls/libc-2.3.3.so
fun:_dl_catch_error_internal
fun:_dl_open
obj:/lib/libdl-2.3.3.so
fun:_dl_catch_error_internal
obj:/lib/libdl-2.3.3.so
fun:dlopen
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_XlcDynamicLoad
fun:_XOpenLC
fun:_XlcCurrentLC
fun:XSetLocaleModifiers
fun:OpenIM
fun:TkpOpenDisplay
fun:GetScreen
fun:CreateTopLevelWindow
fun:TkCreateMainWindow
fun:CreateFrame
fun:TkCreateFrame
fun:Initialize
fun:Tk_Init
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:_dl_new_object
fun:_dl_map_object_from_fd
fun:_dl_map_object_internal
obj:/lib/tls/libc-2.3.3.so
fun:_dl_catch_error_internal
fun:_dl_open
obj:/lib/libdl-2.3.3.so
fun:_dl_catch_error_internal
obj:/lib/libdl-2.3.3.so
fun:dlopen
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_XlcDynamicLoad
fun:_XOpenLC
fun:_XlcCurrentLC
fun:XSetLocaleModifiers
fun:OpenIM
fun:TkpOpenDisplay
fun:GetScreen
fun:CreateTopLevelWindow
fun:TkCreateMainWindow
fun:CreateFrame
fun:TkCreateFrame
fun:Initialize
fun:Tk_Init
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:strdup
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_XlcDynamicLoad
fun:_XOpenLC
fun:_XlcCurrentLC
fun:XSetLocaleModifiers
fun:OpenIM
fun:TkpOpenDisplay
fun:GetScreen
fun:CreateTopLevelWindow
fun:TkCreateMainWindow
fun:CreateFrame
fun:TkCreateFrame
fun:Initialize
fun:Tk_Init
}
{
<insert a suppression name here>
Memcheck:Leak
fun:calloc
fun:_dl_check_map_versions_internal
obj:/lib/tls/libc-2.3.3.so
fun:_dl_catch_error_internal
fun:_dl_open
obj:/lib/libdl-2.3.3.so
fun:_dl_catch_error_internal
obj:/lib/libdl-2.3.3.so
fun:dlopen
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_XlcDynamicLoad
fun:_XOpenLC
fun:_XlcCurrentLC
fun:XSetLocaleModifiers
fun:OpenIM
fun:TkpOpenDisplay
fun:GetScreen
fun:CreateTopLevelWindow
fun:TkCreateMainWindow
fun:CreateFrame
fun:TkCreateFrame
fun:Initialize
fun:Tk_Init
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:XCreateGC
fun:initialize_visual_and_buffer
fun:XMesaCreateWindowBuffer2
fun:Fake_glXMakeContextCurrent
fun:Fake_glXMakeCurrent
fun:glXMakeCurrent
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:XGetVisualInfo
fun:get_visual
fun:choose_x_visual
fun:choose_visual
fun:Fake_glXChooseVisual
fun:glXChooseVisual
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:_mesa_malloc
fun:_mesa_new_buffer_object
fun:_mesa_init_buffer_objects
fun:init_attrib_groups
fun:_mesa_initialize_context
fun:XMesaCreateContext
fun:Fake_glXCreateContext
fun:glXCreateContext
}
{
<insert a suppression name here>
Memcheck:Cond
fun:strchr
}
{
<insert a suppression name here>
Memcheck:Leak
fun:calloc
fun:_dl_new_object
fun:_dl_map_object_from_fd
fun:_dl_map_object_internal
obj:/lib/tls/libc-2.3.3.so
fun:_dl_catch_error_internal
fun:_dl_open
obj:/lib/libdl-2.3.3.so
fun:_dl_catch_error_internal
obj:/lib/libdl-2.3.3.so
fun:dlopen
obj:/usr/X11R6/lib/libX11.so.6.2
fun:_XlcDynamicLoad
fun:_XOpenLC
fun:_XlcCurrentLC
fun:XSetLocaleModifiers
fun:OpenIM
fun:TkpOpenDisplay
fun:GetScreen
fun:CreateTopLevelWindow
fun:TkCreateMainWindow
fun:CreateFrame
fun:TkCreateFrame
fun:Initialize
fun:Tk_Init
}
{
<insert a suppression name here>
Memcheck:Leak
fun:calloc
fun:_mesa_calloc
fun:_mesa_alloc_program
fun:alloc_shared_state
fun:_mesa_initialize_context
fun:XMesaCreateContext
fun:Fake_glXCreateContext
fun:glXCreateContext
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:_mesa_malloc
fun:alloc_vertex_store
fun:_tnl_NewList
fun:_mesa_NewList
fun:glNewList
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:_mesa_malloc
fun:XMesaCreateVisual
fun:save_glx_visual
fun:choose_visual
fun:Fake_glXChooseVisual
fun:glXChooseVisual
}
{
<insert a suppression name here>
Memcheck:Leak
fun:calloc
fun:_mesa_calloc
fun:XMesaCreateVisual
fun:save_glx_visual
fun:choose_visual
fun:Fake_glXChooseVisual
fun:glXChooseVisual
}
{
<insert a suppression name here>
Memcheck:Leak
fun:calloc
fun:_mesa_calloc
fun:_mesa_NewHashTable
fun:_mesa_init_occlude
fun:init_attrib_groups
fun:_mesa_initialize_context
fun:XMesaCreateContext
fun:Fake_glXCreateContext
fun:glXCreateContext
}
{
<insert a suppression name here>
Memcheck:Leak
fun:calloc
fun:_mesa_calloc
fun:Fake_glXCreateContext
fun:glXCreateContext
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
fun:_mesa_malloc
fun:_mesa_strdup
fun:_mesa_init_program
fun:init_attrib_groups
fun:_mesa_initialize_context
fun:XMesaCreateContext
fun:Fake_glXCreateContext
fun:glXCreateContext
}
{
<insert a suppression name here>
Memcheck:Leak
fun:calloc
fun:_mesa_calloc
fun:_mesa_NewHashTable
fun:_mesa_init_depth
fun:init_attrib_groups
fun:_mesa_initialize_context
fun:XMesaCreateContext
fun:Fake_glXCreateContext
fun:glXCreateContext
}
{
<insert a suppression name here>
Memcheck:Leak
fun:calloc
fun:_mesa_calloc
fun:_mesa_new_texture_object
fun:alloc_shared_state
fun:_mesa_initialize_context
fun:XMesaCreateContext
fun:Fake_glXCreateContext
fun:glXCreateContext
}
Data @ 3f620237
Subproject commit fcb25179ab0ec4eb1a510e6d1cee0a09fc304e2e
Subproject commit 3f620237e333229370058d872bd9f8172e48f955
......@@ -6,7 +6,7 @@
command="SetResolution"
number_of_elements="1"
default_values="6" >
<IntRangeDomain min="0" max="512" />
<IntRangeDomain name="range" min="0" max="512" />
</IntVectorProperty>
<DoubleVectorProperty
......@@ -21,7 +21,7 @@
command="SetHeight"
number_of_elements="1"
default_values="1.0" >
<DoubleRangeDomain min="0" />
<DoubleRangeDomain name="range" min="0" />
</DoubleVectorProperty>
<IntVectorProperty
......
<ModuleInterfaces>
<Manipulator name="FlyIn" types="3D" class="vtkPVJoystickFlyIn">
<!--
<Scale variable="FlySpeed" resolution=".1" range="1 30"
trace_name="FlySpeed " trace_slider_movement="1"
help="Set the speed of the camera in fly-in/out modes."/>
-->
</Manipulator>