From 31f2e7902f28a1bbc8d17b7fbdd1391afb376105 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 14 Jul 2009 15:49:40 +0000 Subject: [PATCH] Updated contributors, authors file, news and changelog for 2.8.2-rc3 --- AUTHORS.txt | 13 +- CMakeLists.txt | 2 +- ChangeLog | 146 +++++++++++++++++++++++ NEWS.txt | 10 +- applications/osgversion/Contributors.cpp | 1 + 5 files changed, 163 insertions(+), 9 deletions(-) diff --git a/AUTHORS.txt b/AUTHORS.txt index e383f6dea..2e77d7c0a 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ OpenSceneGraph Library 2.8.2 -372 Contributors: +373 Contributors: Firstname Surname ----------------- @@ -9,9 +9,9 @@ Don Burns Marco Jez Paul Martz Mike Weiblen +Mathias Fröhlich Eric Wing Stephan Huber -Mathias Fröhlich Brede Johansen Geoff Michel Farshid Lashkari @@ -64,15 +64,15 @@ Philip Lowman Chris Denham Melchior Franz Lionel Lagarde +David Fries +Bryan Thrall +Terry Welsh Serge Lages Joran Jessurun Frederic Marmond -David Fries -Bryan Thrall Boris Bralo Yefei He Tim Moore -Terry Welsh Stephane Lamoliatte Sondra Iverson Rune Schmidt Jensen @@ -237,7 +237,6 @@ Tomas Hnilica Tino Schwarze Thomas Weidner Thom Carlo -Tery Welsh Steven Thomas Simon Hammett Sid Byce @@ -264,6 +263,7 @@ Philipp M Petr Salinger Paul Palumbo Paul Fredrikson +Paul Fotheringham Patrick Hartling Parag Chaudhur Panagiotis Papadakos @@ -346,6 +346,7 @@ Danny Valente Daniel Stien Dan Minor Cyril Brulebois +Cory Riddell Clay Fowler Chuck Sembroski Chuck Seberion diff --git a/CMakeLists.txt b/CMakeLists.txt index a8d8a6044..3212a1347 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,7 +35,7 @@ SET(OPENSCENEGRAPH_SOVERSION 55) # set to 0 when not a release candidate, non zero means that any generated # svn tags will be treated as release candidates of given number -SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 2) +SET(OPENSCENEGRAPH_RELEASE_CANDIDATE 3) SET(OPENSCENEGRAPH_VERSION ${OPENSCENEGRAPH_MAJOR_VERSION}.${OPENSCENEGRAPH_MINOR_VERSION}.${OPENSCENEGRAPH_PATCH_VERSION}) diff --git a/ChangeLog b/ChangeLog index bd6220517..8f51a83b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,149 @@ +2009-07-13 16:45 robert + + * src/osgViewer, src/osgViewer/GraphicsWindowWin32.cpp: From Cory + Riddell based on suggestion from Robert Osfield, "I've been + running with your suggested changes for a few days now and it + has been working perfectly. I'm still not entirely clear why + adding a + slave/subgraph causes the problem." + +2009-07-13 16:07 robert + + * src/OpenThreads/win32, + src/OpenThreads/win32/Win32ConditionPrivateData.h: From David + Fries, "Here is a fix for a deadlock seen under Windows using + OpenThreads + Barrier operations. The error is with atomic operations in the + win32 condition implementation. The attached sample program will + reliably trigger with as few as three threads and a dual core + system, + though sometimes it will take 65,000 iterations. + + 2.8.1 was the base for these changes + + Win32ConditionPrivateData.h + Win32ConditionPrivateData::wait does two operations to decrement + waiters_ then read, when InterlockedDecrement decrements and + returns + the value in one operation. The two operations allows another + thread + to also decrement with both getting 0 for an answer. + + Win32ConditionPrivateData::broadcast is using waiters_ directly + instead of using the w value read earlier, if it was safe to use + waiters_ directly there would be no need for InterlockedGet or w. + + overview of deadlock in barrier with three threads + one thread in broadcast, 2 threads in wait, + release semaphore 2, waits on waiters_done_ + both threads wake, decrement waiters_, get 0 for w, + + one calls set waiters_done_, + broadcast thread comes out of waiters_done_, + other thread calls waiters_done_, (which leaves waiters_done_ in + the + signaled state) + + broadcast thread returns releases mutex, other threads get + mutex and also return, + next barrier, first two threads enter wait, one goes to + broadcast, release + semaphore 2, skips waiters_done_ as it had been released last + time + returns, processes, enters the barrier for the next barrier + operation + and waits, + three threads are now in wait, two have the previous barrier + phase, + one the current phase, there's one count left in the semaphore + which a + thread gets, returns, enters the barrier as a waiter, sleeps, and + the + deadlock is completed" + + Merged from svn/trunk using: + + svn merge -r 10456:10457 + http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/OpenThreads/win32 + +2009-07-03 19:08 robert + + * src/osgPlugins/dicom/CMakeLists.txt: From Paul Fotheringham, + fixed linux build error when compiling dicom plugin against ITK + by adding define VCL_CAN_STATIC_CONST_INIT_FLOAT to be zero. + + From Robert Osfield, general clean up of CMakeLists.txt under ITK + side + +2009-07-01 15:39 robert + + * src/osgPlugins/OpenFlight/ExportOptions.cpp: From Bryan Thrall, + "The OpenFlight plugin doesn't handle unrecognized options or + extra + whitespace in all cases, causing it to crash." + +2009-06-29 09:50 robert + + * NEWS.txt, README.txt: Updated NEWS for and READE for 2.9.2-rc2. + +2009-06-29 09:47 robert + + * CMakeLists.txt: Updated release candidate to 2 + +2009-06-29 09:46 robert + + * examples/osgshadow/osgshadow.cpp: Made --pssm and --sv options + use SingleThreaded viewer to workaround threading issues with + ParallelSplitShadowMap and ShadowVolume techniques. + +2009-06-25 16:08 robert + + * NEWS.txt: Updated to NEWS to map to wiki NEWS item + +2009-06-25 14:06 robert + + * src/osg/ArgumentParser.cpp, src/osg/CullSettings.cpp, + src/osg/DisplaySettings.cpp, src/osgDB/DatabasePager.cpp, + src/osgGA/DriveManipulator.cpp, + src/osgPlugins/bsp/VBSPEntity.cpp, + src/osgPlugins/cfg/ConfigParser.cpp, + src/osgPlugins/dw/ReaderWriterDW.cpp, + src/osgPlugins/ive/DataOutputStream.cpp, + src/osgPlugins/normals/ReaderWriterNormals.cpp, + src/osgPlugins/txp/ReaderWriterTXP.cpp, + src/osgPlugins/txp/TXPParser.cpp, + src/osgViewer/ViewerEventHandlers.cpp: From Mathias Froehlich, + changes from atof to use osg::asciiToFloat() to avoid locale + issues with atof + +2009-06-25 13:27 robert + + * include/osg, include/osg/Endian: From Mathias Froehlich, "Fix + possible problem with aliasing rules... and fix a gcc warning :) + Use a union to determine if we are on a little endian or big + endian machine." + + Merged from svn/trunk using : + + svn merge -r 10409:10410 + http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/include/osg/ + +2009-06-22 16:04 robert + + * src/osgPlugins/txp, src/osgPlugins/txp/trpage_swap.cpp: Fixed + swap size error. + + Merged from svn/trunk using: + + svn merge -r 10386:10387 + http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/txp/ + +2009-06-22 09:32 robert + + * AUTHORS.txt, ChangeLog, NEWS.txt, + applications/osgversion/Contributors.cpp: Updated NEWS, AUTHORS + and ChangeLog for 2.8.2-rc1 release + 2009-06-22 07:42 robert * src/osgPlugins/osg/StateSet.cpp: Merged from svn/trunk fix to diff --git a/NEWS.txt b/NEWS.txt index 48d1af7f7..4a2f5e121 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -3,14 +3,20 @@ OSG News = !OpenSceneGraph 2.8.2 release - bug fix release = -PERTHSHIRE, Scotland - x June 2009 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.8.2, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.8 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.8 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems. +PERTHSHIRE, Scotland - 14th July 2009 - !OpenSceneGraph Professional Services announces the release of !OpenSceneGraph 2.8.2, the industry's leading open-source scene graph technology, designed to accelerate application development and improve 3D graphics performance. !OpenSceneGraph 2.8 written entirely in Standard C++ and built upon OpenGL, offers developers working in the visual simulation, game development, virtual reality, scientific visualization and modeling markets - a real-time visualization tool which eclipses commercial scene graph toolkits in functionality, stability and performance. !OpenSceneGraph 2.8 runs on all Microsoft Windows platforms, Apple OS/X, GNU/Linux, IRIX, Solaris, HP-UX, AIX and FreeBSD operating systems. === Open-source development delivers industry-leading features and performance === The !OpenSceneGraph 2.8.2 release is the culmination of 10 years of work by the lead developers and the open-source community that has grown up around the project. The real-time graphics industry and academia embraced it from the very beginning, deploying it in real-world applications, and actively participating in its development, testing and refinement. The end result is a high-quality library with a feature set relevant to application developers' needs. === Updates between 2.8.2 and 2.8.1 releases include: === - * Build fixes for !RedHat Enterprise Linux. + * Build fixes for: + * !RedHat Enterprise Linux + * Building of dicom plugin with ITK under Linux. + * Crash fixes to: + * crash during window destruction under Windows when using closing a MFC based GraphicsWindow + * deadlock under Windows due threading issues with atomic operations in Win32 Barrier implementation + * OpenFlight plugin not handling spaces at the end of option strings. * Bug fixes to : * computation of sector range in osgSim::!LightPoint * extension checking of FBO packed stencil support diff --git a/applications/osgversion/Contributors.cpp b/applications/osgversion/Contributors.cpp index 8ae2a61f1..7ea744d23 100644 --- a/applications/osgversion/Contributors.cpp +++ b/applications/osgversion/Contributors.cpp @@ -378,6 +378,7 @@ TypoCorrection typoCorrections[] = {"Sylvan", "Sylvain"}, {"Takeahei", "Takahei"}, {"Takehei", "Takahei"}, + {"Tery", "Terry"}, {"Tarantilils", "Tarantilis"}, {"Trastenjak", "Trstenjak"}, {"Urlich", "Ulrich"},