Change #4453

Comments

Merge branch 'master' into features/python3

Changed files

• CMakeLists.txt
• CreateVersionFile.py
• fixcopyright.py
• python/libavg/__init__.py
• python/libavg/app/__init__.py
• python/libavg/app/app.py
• python/libavg/app/debugpanel.py
• python/libavg/app/flashmessage.py
• python/libavg/app/keyboardmanager.py
• python/libavg/app/settings.py
• python/libavg/app/touchvisualization.py
• python/libavg/apphelpers.py
• python/libavg/clicktest.py
• python/libavg/filter.py
• python/libavg/geom.py
• python/libavg/gesture.py
• python/libavg/graph.py
• python/libavg/methodref.py
• python/libavg/mtemu.py
• python/libavg/parsecamargs.py
• python/libavg/persist.py
• python/libavg/sprites.py
• python/libavg/statemachine.py
• python/libavg/testapp.py
• python/libavg/testcase.py
• python/libavg/textarea.py
• python/libavg/utils.py
• python/libavg/widget/__init__.py
• python/libavg/widget/base.py
• python/libavg/widget/button.py
• python/libavg/widget/keyboard.py
• python/libavg/widget/mediacontrol.py
• python/libavg/widget/scrollarea.py
• python/libavg/widget/skin.py
• python/libavg/widget/slider.py
• python/scripts/avg_audioplayer
• python/scripts/avg_checkcirclespeed
• python/scripts/avg_checkcurvespeed
• python/scripts/avg_checkpolygonspeed
• python/scripts/avg_checkspeed
• python/scripts/avg_checktouch
• python/scripts/avg_checkvsync
• python/scripts/avg_chromakey
• python/scripts/avg_dumpkeyevents
• python/scripts/avg_jitterfilter
• python/scripts/avg_showcamera
• python/scripts/avg_showfile
• python/scripts/avg_showfont
• python/scripts/avg_showsvg
• python/scripts/avg_test
• python/scripts/avg_videoinfo
• python/scripts/avg_videoplayer
• samples/abort_gestures.py
• samples/anim1.py
• samples/anim2.py
• samples/app_complete.py
• samples/app_minimal.py
• samples/asyncload.py
• samples/attributes.py
• samples/canvas_events.py
• samples/color.py
• samples/drag.py
• samples/dynamicmask.py
• samples/event.py
• samples/firebirds/firebirds.py
• samples/firebirds/plugin/CollisionDetector.cpp
• samples/firebirds/plugin/CollisionDetector.h
• samples/flashmessages.py
• samples/fontstyle.py
• samples/gestures.py
• samples/globalcoords.py
• samples/huesatfx.py
• samples/invertfx.py
• samples/keyevent.py
• samples/lines.py
• samples/localcoords.py
• samples/localcoordsrot.py
• samples/logsample.py
• samples/mesh.py
• samples/minimal.py
• samples/mousewheel.py
• samples/numberpad.py
• samples/ondown.py
• samples/pillow.py
• samples/plugin.py
• samples/rendering.py
• samples/rotcustompivot.py
• samples/rotdefaultpivot.py
• samples/showvideo.py
• samples/slideshow.py
• samples/sprite.py
• samples/subclass.py
• samples/timer.py
• samples/timer2.py
• samples/timer3.py
• samples/twovideos.py
• samples/vector.py
• samples/video.py
• samples/video_writer.py
• samples/videochooser.py
• samples/warp.py
• samples/widget.py
• samples/wordspos.py
• sphinxdoc/app.rst
• sphinxdoc/areanodes.rst
• sphinxdoc/conf.py
• src/anim/Anim.cpp
• src/anim/Anim.h
• src/anim/AttrAnim.cpp
• src/anim/AttrAnim.h
• src/anim/ContinuousAnim.cpp
• src/anim/ContinuousAnim.h
• src/anim/EaseInOutAnim.cpp
• src/anim/EaseInOutAnim.h
• src/anim/LinearAnim.cpp
• src/anim/LinearAnim.h
• src/anim/ParallelAnim.cpp
• src/anim/ParallelAnim.h
• src/anim/SimpleAnim.cpp
• src/anim/SimpleAnim.h
• src/anim/StateAnim.cpp
• src/anim/StateAnim.h
• src/anim/WaitAnim.cpp
• src/anim/WaitAnim.h
• src/api.h
• src/audio/AudioBuffer.cpp
• src/audio/AudioBuffer.h
• src/audio/AudioEngine.cpp
• src/audio/AudioEngine.h
• src/audio/AudioMsg.cpp
• src/audio/AudioMsg.h
• src/audio/AudioParams.cpp
• src/audio/AudioParams.h
• src/audio/AudioSource.cpp
• src/audio/AudioSource.h
• src/audio/Dynamics.h
• src/audio/IProcessor.h
• src/audio/testlimiter.cpp
• src/avgconfigwrapper.h
• src/base/Backtrace.cpp
• src/base/Backtrace.h
• src/base/BezierCurve.cpp
• src/base/BezierCurve.h
• src/base/CmdQueue.h
• src/base/Command.h
• src/base/ConfigMgr.cpp
• src/base/ConfigMgr.h
• src/base/CubicSpline.cpp
• src/base/CubicSpline.h
• src/base/DAG.cpp
• src/base/DAG.h
• src/base/DirEntry.cpp
• src/base/DirEntry.h
• src/base/Directory.cpp
• src/base/Directory.h
• src/base/DlfcnWrapper.cpp
• src/base/DlfcnWrapper.h
• src/base/Exception.cpp
• src/base/Exception.h
• src/base/FileHelper.cpp
• src/base/FileHelper.h
• src/base/GLMHelper.cpp
• src/base/GLMHelper.h
• src/base/GeomHelper.cpp
• src/base/GeomHelper.h
• src/base/IFrameEndListener.h
• src/base/ILogSink.h
• src/base/IPlaybackEndListener.h
• src/base/IPreRenderListener.h
• src/base/Logger.cpp
• src/base/Logger.h
• src/base/MathHelper.cpp
• src/base/MathHelper.h
• src/base/OSHelper.cpp
• src/base/OSHelper.h
• src/base/ObjectCounter.cpp
• src/base/ObjectCounter.h
• src/base/ProfilingZone.cpp
• src/base/ProfilingZone.h
• src/base/ProfilingZoneID.cpp
• src/base/ProfilingZoneID.h
• src/base/Queue.h
• src/base/Rect.h
• src/base/ScopeTimer.cpp
• src/base/ScopeTimer.h
• src/base/Signal.h
• src/base/StandardLogSink.cpp
• src/base/StandardLogSink.h
• src/base/StringHelper.cpp
• src/base/StringHelper.h
• src/base/Test.cpp
• src/base/Test.h
• src/base/TestSuite.cpp
• src/base/TestSuite.h
• src/base/ThreadHelper.cpp
• src/base/ThreadHelper.h
• src/base/ThreadProfiler.cpp
• src/base/ThreadProfiler.h
• src/base/TimeSource.cpp
• src/base/TimeSource.h
• src/base/Triangle.cpp
• src/base/Triangle.h
• src/base/UTF8String.cpp
• src/base/UTF8String.h
• src/base/WideLine.cpp
• src/base/WideLine.h
• src/base/WorkerThread.h
• src/base/XMLHelper.cpp
• src/base/XMLHelper.h
• src/base/testbase.cpp
• src/graphics/AppleDisplay.cpp
• src/graphics/AppleDisplay.h
• src/graphics/BCMDisplay.cpp
• src/graphics/BCMDisplay.h
• src/graphics/Bitmap.cpp
• src/graphics/Bitmap.h
• src/graphics/BitmapLoader.cpp
• src/graphics/BitmapLoader.h
• src/graphics/BmpTextureMover.cpp
• src/graphics/BmpTextureMover.h
• src/graphics/CGLContext.cpp
• src/graphics/CGLContext.h
• src/graphics/CachedImage.cpp
• src/graphics/CachedImage.h
• src/graphics/Color.cpp
• src/graphics/Color.h
• src/graphics/Display.cpp
• src/graphics/Display.h
• src/graphics/EGLContext.cpp
• src/graphics/EGLContext.h
• src/graphics/FBO.cpp
• src/graphics/FBO.h
• src/graphics/FBOInfo.cpp
• src/graphics/FBOInfo.h
• src/graphics/Filter.cpp
• src/graphics/Filter.h
• src/graphics/Filter3x3.cpp
• src/graphics/Filter3x3.h
• src/graphics/FilterBandpass.cpp
• src/graphics/FilterBandpass.h
• src/graphics/FilterBlur.cpp
• src/graphics/FilterBlur.h
• src/graphics/FilterConvol.h
• src/graphics/FilterDilation.cpp
• src/graphics/FilterDilation.h
• src/graphics/FilterErosion.cpp
• src/graphics/FilterErosion.h
• src/graphics/FilterFastDownscale.cpp
• src/graphics/FilterFastDownscale.h
• src/graphics/FilterFloodfill.h
• src/graphics/FilterGauss.cpp
• src/graphics/FilterGauss.h
• src/graphics/FilterGetAlpha.cpp
• src/graphics/FilterGetAlpha.h
• src/graphics/FilterHighpass.cpp
• src/graphics/FilterHighpass.h
• src/graphics/FilterIntensity.cpp
• src/graphics/FilterIntensity.h
• src/graphics/FilterMask.cpp
• src/graphics/FilterMask.h
• src/graphics/FilterNormalize.cpp
• src/graphics/FilterNormalize.h
• src/graphics/FilterResizeBilinear.cpp
• src/graphics/FilterResizeBilinear.h
• src/graphics/FilterResizeGaussian.cpp
• src/graphics/FilterResizeGaussian.h
• src/graphics/FilterThreshold.cpp
• src/graphics/FilterThreshold.h
• src/graphics/FilterUnmultiplyAlpha.cpp
• src/graphics/FilterUnmultiplyAlpha.h
• src/graphics/Filtercolorize.cpp
• src/graphics/Filtercolorize.h
• src/graphics/Filterfill.h
• src/graphics/Filterfillrect.h
• src/graphics/Filterflip.cpp
• src/graphics/Filterflip.h
• src/graphics/FilterflipX.cpp
• src/graphics/FilterflipX.h
• src/graphics/Filterfliprgb.cpp
• src/graphics/Filterfliprgb.h
• src/graphics/Filterfliprgba.cpp
• src/graphics/Filterfliprgba.h
• src/graphics/Filterflipuv.cpp
• src/graphics/Filterflipuv.h
• src/graphics/Filtergrayscale.cpp
• src/graphics/Filtergrayscale.h
• src/graphics/GLBufferCache.cpp
• src/graphics/GLBufferCache.h
• src/graphics/GLConfig.cpp
• src/graphics/GLConfig.h
• src/graphics/GLContext.cpp
• src/graphics/GLContext.h
• src/graphics/GLContextAttribs.cpp
• src/graphics/GLContextAttribs.h
• src/graphics/GLContextManager.cpp
• src/graphics/GLContextManager.h
• src/graphics/GLShaderParam.cpp
• src/graphics/GLShaderParam.h
• src/graphics/GLTexture.cpp
• src/graphics/GLTexture.h
• src/graphics/GLXContext.cpp
• src/graphics/GLXContext.h
• src/graphics/GPUBandpassFilter.cpp
• src/graphics/GPUBandpassFilter.h
• src/graphics/GPUBlurFilter.cpp
• src/graphics/GPUBlurFilter.h
• src/graphics/GPUBrightnessFilter.cpp
• src/graphics/GPUBrightnessFilter.h
• src/graphics/GPUChromaKeyFilter.cpp
• src/graphics/GPUChromaKeyFilter.h
• src/graphics/GPUFilter.cpp
• src/graphics/GPUFilter.h
• src/graphics/GPUHueSatFilter.cpp
• src/graphics/GPUHueSatFilter.h
• src/graphics/GPUInvertFilter.cpp
• src/graphics/GPUInvertFilter.h
• src/graphics/GPUNullFilter.cpp
• src/graphics/GPUNullFilter.h
• src/graphics/GPURGB2YUVFilter.cpp
• src/graphics/GPURGB2YUVFilter.h
• src/graphics/GPUShadowFilter.cpp
• src/graphics/GPUShadowFilter.h
• src/graphics/GraphicsTest.cpp
• src/graphics/GraphicsTest.h
• src/graphics/ImageCache.cpp
• src/graphics/ImageCache.h
• src/graphics/ImagingProjection.cpp
• src/graphics/ImagingProjection.h
• src/graphics/MCFBO.cpp
• src/graphics/MCFBO.h
• src/graphics/MCShaderParam.cpp
• src/graphics/MCShaderParam.h
• src/graphics/MCTexture.cpp
• src/graphics/MCTexture.h
• src/graphics/OGLHelper.cpp
• src/graphics/OGLHelper.h
• src/graphics/OGLShader.cpp
• src/graphics/OGLShader.h
• src/graphics/PBO.cpp
• src/graphics/PBO.h
• src/graphics/Pixel16.h
• src/graphics/Pixel24.h
• src/graphics/Pixel32.cpp
• src/graphics/Pixel32.h
• src/graphics/Pixel8.h
• src/graphics/PixelFormat.cpp
• src/graphics/PixelFormat.h
• src/graphics/Pixeldefs.h
• src/graphics/ShaderRegistry.cpp
• src/graphics/ShaderRegistry.h
• src/graphics/StandardShader.cpp
• src/graphics/StandardShader.h
• src/graphics/SubVertexArray.cpp
• src/graphics/SubVertexArray.h
• src/graphics/TexInfo.cpp
• src/graphics/TexInfo.h
• src/graphics/TextureMover.cpp
• src/graphics/TextureMover.h
• src/graphics/VertexArray.cpp
• src/graphics/VertexArray.h
• src/graphics/VertexData.cpp
• src/graphics/VertexData.h
• src/graphics/WGLContext.cpp
• src/graphics/WGLContext.h
• src/graphics/WinDisplay.cpp
• src/graphics/WinDisplay.h
• src/graphics/WrapMode.cpp
• src/graphics/WrapMode.h
• src/graphics/X11Display.cpp
• src/graphics/X11Display.h
• src/graphics/benchmarkgraphics.cpp
• src/graphics/shaders/bandpass.frag
• src/graphics/shaders/brightness.frag
• src/graphics/shaders/chromakey.frag
• src/graphics/shaders/chromakey_erosion.frag
• src/graphics/shaders/helper.frag
• src/graphics/shaders/horizblur.frag
• src/graphics/shaders/horizshadow.frag
• src/graphics/shaders/huesat.frag
• src/graphics/shaders/invert.frag
• src/graphics/shaders/minimal.frag
• src/graphics/shaders/null.frag
• src/graphics/shaders/rgb2yuv.frag
• src/graphics/shaders/standard.frag
• src/graphics/shaders/standard.vert
• src/graphics/shaders/vertblur.frag
• src/graphics/shaders/vertshadow.frag
• src/graphics/testgpu.cpp
• src/graphics/testgraphics.cpp
• src/imaging/CMUCamera.cpp
• src/imaging/CMUCamera.h
• src/imaging/CMUCameraUtils.cpp
• src/imaging/CMUCameraUtils.h
• src/imaging/Camera.cpp
• src/imaging/Camera.h
• src/imaging/CameraInfo.cpp
• src/imaging/CameraInfo.h
• src/imaging/DSCamera.cpp
• src/imaging/DSCamera.h
• src/imaging/DSHelper.cpp
• src/imaging/DSHelper.h
• src/imaging/DSSampleGrabber.cpp
• src/imaging/DSSampleGrabber.h
• src/imaging/FWCamera.cpp
• src/imaging/FWCamera.h
• src/imaging/FWCameraUtils.cpp
• src/imaging/FWCameraUtils.h
• src/imaging/FakeCamera.cpp
• src/imaging/FakeCamera.h
• src/imaging/IDSSampleCallback.h
• src/imaging/V4LCamera.cpp
• src/imaging/V4LCamera.h
• src/player/AVGNode.cpp
• src/player/AVGNode.h
• src/player/AreaNode.cpp
• src/player/AreaNode.h
• src/player/Arg.h
• src/player/ArgBase.cpp
• src/player/ArgBase.h
• src/player/ArgList.cpp
• src/player/ArgList.h
• src/player/BitmapManager.cpp
• src/player/BitmapManager.h
• src/player/BitmapManagerMsg.cpp
• src/player/BitmapManagerMsg.h
• src/player/BitmapManagerThread.cpp
• src/player/BitmapManagerThread.h
• src/player/BlurFXNode.cpp
• src/player/BlurFXNode.h
• src/player/BoostPython.h
• src/player/CameraNode.cpp
• src/player/CameraNode.h
• src/player/Canvas.cpp
• src/player/Canvas.h
• src/player/CanvasNode.cpp
• src/player/CanvasNode.h
• src/player/ChromaKeyFXNode.cpp
• src/player/ChromaKeyFXNode.h
• src/player/CircleNode.cpp
• src/player/CircleNode.h
• src/player/Contact.cpp
• src/player/Contact.h
• src/player/CursorEvent.cpp
• src/player/CursorEvent.h
• src/player/CursorState.cpp
• src/player/CursorState.h
• src/player/CurveNode.cpp
• src/player/CurveNode.h
• src/player/DisplayEngine.cpp
• src/player/DisplayEngine.h
• src/player/DisplayParams.cpp
• src/player/DisplayParams.h
• src/player/DivNode.cpp
• src/player/DivNode.h
• src/player/Event.cpp
• src/player/Event.h
• src/player/EventDispatcher.cpp
• src/player/EventDispatcher.h
• src/player/ExportedObject.cpp
• src/player/ExportedObject.h
• src/player/FXNode.cpp
• src/player/FXNode.h
• src/player/FilledVectorNode.cpp
• src/player/FilledVectorNode.h
• src/player/FontStyle.cpp
• src/player/FontStyle.h
• src/player/GPUImage.cpp
• src/player/GPUImage.h
• src/player/HueSatFXNode.cpp
• src/player/HueSatFXNode.h
• src/player/IBitmapLoadedListener.h
• src/player/ImageNode.cpp
• src/player/ImageNode.h
• src/player/InputDevice.cpp
• src/player/InputDevice.h
• src/player/InvertFXNode.cpp
• src/player/InvertFXNode.h
• src/player/KeyEvent.cpp
• src/player/KeyEvent.h
• src/player/LineNode.cpp
• src/player/LineNode.h
• src/player/MainCanvas.cpp
• src/player/MainCanvas.h
• src/player/MeshNode.cpp
• src/player/MeshNode.h
• src/player/MessageID.cpp
• src/player/MessageID.h
• src/player/MouseEvent.cpp
• src/player/MouseEvent.h
• src/player/MouseWheelEvent.cpp
• src/player/MouseWheelEvent.h
• src/player/MultitouchInputDevice.cpp
• src/player/MultitouchInputDevice.h
• src/player/Node.cpp
• src/player/Node.h
• src/player/NodeChain.cpp
• src/player/NodeChain.h
• src/player/NullFXNode.cpp
• src/player/NullFXNode.h
• src/player/OGLSurface.cpp
• src/player/OGLSurface.h
• src/player/OffscreenCanvas.cpp
• src/player/OffscreenCanvas.h
• src/player/OffscreenCanvasNode.cpp
• src/player/OffscreenCanvasNode.h
• src/player/Player.cpp
• src/player/Player.h
• src/player/PluginManager.cpp
• src/player/PluginManager.h
• src/player/PolyLineNode.cpp
• src/player/PolyLineNode.h
• src/player/PolygonNode.cpp
• src/player/PolygonNode.h
• src/player/Publisher.cpp
• src/player/Publisher.h
• src/player/PublisherDefinition.cpp
• src/player/PublisherDefinition.h
• src/player/PublisherDefinitionRegistry.cpp
• src/player/PublisherDefinitionRegistry.h
• src/player/PythonLogSink.cpp
• src/player/PythonLogSink.h
• src/player/RasterNode.cpp
• src/player/RasterNode.h
• src/player/RectNode.cpp
• src/player/RectNode.h
• src/player/SDLTouchInputDevice.cpp
• src/player/SDLTouchInputDevice.h
• src/player/SDLWindow.cpp
• src/player/SDLWindow.h
• src/player/SVG.cpp
• src/player/SVG.h
• src/player/SVGElement.cpp
• src/player/SVGElement.h
• src/player/SecondaryWindow.cpp
• src/player/SecondaryWindow.h
• src/player/ShadowFXNode.cpp
• src/player/ShadowFXNode.h
• src/player/Shape.cpp
• src/player/Shape.h
• src/player/SoundNode.cpp
• src/player/SoundNode.h
• src/player/SubscriberInfo.cpp
• src/player/SubscriberInfo.h
• src/player/TUIOInputDevice.cpp
• src/player/TUIOInputDevice.h
• src/player/TangibleEvent.cpp
• src/player/TangibleEvent.h
• src/player/TestHelper.cpp
• src/player/TestHelper.h
• src/player/TextEngine.cpp
• src/player/TextEngine.h
• src/player/Timeout.cpp
• src/player/Timeout.h
• src/player/TouchEvent.cpp
• src/player/TouchEvent.h
• src/player/TouchStatus.cpp
• src/player/TouchStatus.h
• src/player/TypeDefinition.cpp
• src/player/TypeDefinition.h
• src/player/TypeRegistry.cpp
• src/player/TypeRegistry.h
• src/player/VectorNode.cpp
• src/player/VectorNode.h
• src/player/VersionInfo.cpp
• src/player/VersionInfo.h
• src/player/VideoNode.cpp
• src/player/VideoNode.h
• src/player/VideoWriter.cpp
• src/player/VideoWriter.h
• src/player/VideoWriterThread.cpp
• src/player/VideoWriterThread.h
• src/player/Window.cpp
• src/player/Window.h
• src/player/WindowParams.cpp
• src/player/WindowParams.h
• src/player/WordsNode.cpp
• src/player/WordsNode.h
• src/player/WrapPython.cpp
• src/player/WrapPython.h
• src/player/testplayer.cpp
• src/test/AVTest.py
• src/test/AnimTest.py
• src/test/AppTest.py
• src/test/DynamicsTest.py
• src/test/EventTest.py
• src/test/FXTest.py
• src/test/GestureTest.py
• src/test/ImageTest.py
• src/test/LoggerTest.py
• src/test/MultiWindowTest.py
• src/test/OffscreenTest.py
• src/test/PlayerTest.py
• src/test/PluginTest.py
• src/test/PythonTest.py
• src/test/Test.py
• src/test/VectorTest.py
• src/test/WidgetTest.py
• src/test/WordsTest.py
• src/test/camcfgs.py
• src/test/checkcamera.py
• src/test/checkpoly.py
• src/test/plugin/ColorNode.cpp
• src/video/AsyncVideoDecoder.cpp
• src/video/AsyncVideoDecoder.h
• src/video/AudioDecoderThread.cpp
• src/video/AudioDecoderThread.h
• src/video/FFMpegDemuxer.cpp
• src/video/FFMpegDemuxer.h
• src/video/FFMpegFrameDecoder.cpp
• src/video/FFMpegFrameDecoder.h
• src/video/SyncVideoDecoder.cpp
• src/video/SyncVideoDecoder.h
• src/video/VideoDecoder.cpp
• src/video/VideoDecoder.h
• src/video/VideoDecoderThread.cpp
• src/video/VideoDecoderThread.h
• src/video/VideoDemuxerThread.cpp
• src/video/VideoDemuxerThread.h
• src/video/VideoInfo.cpp
• src/video/VideoInfo.h
• src/video/VideoMsg.cpp
• src/video/VideoMsg.h
• src/video/WrapFFMpeg.cpp
• src/video/WrapFFMpeg.h
• src/video/testvideo.cpp
• src/wrapper/WrapHelper.cpp
• src/wrapper/WrapHelper.h
• src/wrapper/anim_wrap.cpp
• src/wrapper/avg_wrap.cpp
• src/wrapper/bitmap_wrap.cpp
• src/wrapper/event_wrap.cpp
• src/wrapper/fx_wrap.cpp
• src/wrapper/misc_wrap.cpp
• src/wrapper/node_wrap.cpp
• src/wrapper/raster2_wrap.cpp
• src/wrapper/raster_wrap.cpp
• src/wrapper/vector_wrap.cpp
• update_copyright.py