diff --git a/AUTHORS.txt b/AUTHORS.txt index c0016d7a6..e0f035254 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,6 +1,6 @@ -OpenSceneGraph Library 2.7.7 +OpenSceneGraph Library 2.7.9 -359 Contributors: +364 Contributors: Firstname Surname ----------------- @@ -10,9 +10,9 @@ Marco Jez Paul Martz Mike Weiblen Eric Wing -Brede Johansen Stephan Huber Mathias Fröhlich +Brede Johansen Geoff Michel Farshid Lashkari Bob Kuehne @@ -27,46 +27,47 @@ Trajce Nikolov Mike Wittman Wojciech Lewandowski Colin McDonald +Andy Skinner +Roger James Pavel Moloshtan Tom Jolley -Roger James Jeremy Moles -Andy Skinner +Paul Melis Norman Vine +Mattias Helsing +Jason Beverage Art Tevs Alberto Farre André Garneau Ruben Lopez Randall Hopper Michael Platings -Jason Beverage +Cedric Pinson Adrian Egli -Paul Melis Olaf Flebbe +Jason Daly +J.P. Delport Gideon May Don Tidrow +Sherman Wilcox Romano José Magacho da Silva +Roland Smeenk Per Fahlberg Michael Gronager Mathieu Marache Joakim Simonsson -J.P. Delport David Spilling Daniel Sjölie Chris Hanson -Sherman Wilcox Philip Lowman -Jason Daly +Alberto Luaces Melchior Franz Chris Denham -Cedric Pinson Serge Lages -Roland Smeenk Joran Jessurun Frederic Marmond David Fries Boris Bralo -Alberto Luaces Yefei He Tim Moore Terry Welsh @@ -84,7 +85,6 @@ Ben Discoe Andreas Ekstrand Sasa Bistrovic Neil Groves -Mattias Helsing Martin Naylor Martin Aumueller Markus Trenkwalder @@ -99,17 +99,22 @@ Vivek Rajan Thibault Genessay Sean Spicer Ravi Mathur +Peter Hrenka Nikolaus Hanekamp Neil Salter Mihai Radu Michael Hartman Luc Frauciel +Lionel Lagarde Laurens Voerman David Guthrie Corbin Holtz Brad Christiansen +Blasius Czink Toshiyuki Takahei Thom DeCarlo +Tatsuhiro Nishioka +Sukender Simon Julier Sebastien Grignard Romano Magacho @@ -123,18 +128,16 @@ Daniel Larimer Csaba Halasz Colin Dunlop Bruce Clay -Blasius Czink Alberto Barbati Vladimir Shabanov Uwe Woessner Tony Horrobin -Tatsuhiro Nishioka Sohey Yamamoto +Rudolf Wiedemann Riccardo Corsi Ralf Habacker Rafa Gaitan Phil Atkin -Peter Hrenka Mattias Linde Maria Ten Ken Sewell @@ -163,13 +166,12 @@ Tugkan Calapoglu Tim Daoust Terrex Sylvain Marie -Sukender Steve Lunsford Stephane Simon Stephan Eilemann Stanislav Blinov +Sergey Leontyev Sebastian Messerschmidt -Rudolf Wiedemann Ralf Kern Perry Miller Nathan Monteleone @@ -180,7 +182,6 @@ Maya Leonard Max Bandazian Mathew May Martijn Kragtwijk -Lionel Lagarde Kevin Moiule Keith Steffen Katharina Plugge @@ -196,8 +197,10 @@ Guillaume Chouvenc Gerrick Bivins George Tarantilis Ferdi Smit +Ewe Woessner Erik den Dekker Edgar Ellis +Don Leich David Ergo Daniel Trstenjak Christophe Loustaunau @@ -229,13 +232,13 @@ Simon Hammett Sid Byce Shuxing Xiao Shane Arnott -Sergey Leontyev Sebastien Kuntz Ruth Lang Ronny Krueger Robert Swain Rob Bloemkool Rick Pingry +Rick Appleton Ricard Schmidt Rene Molenaar Reinhard Sainitzer @@ -249,6 +252,7 @@ Philipp M Paul Palumbo Paul Obermeier Paul Fredrikson +Patrick Hartling Parag Chaudhur Panagiotis Papadakos Panagiotis Koutsourakis @@ -291,6 +295,7 @@ Kristopher Bixler Karsten Weiss Karl Heijdenberg Jutta Sauer +Julian Scheid Josh Portway John Tan John Grant @@ -317,8 +322,8 @@ Frank Warmerdam Frank Lindeman Frank Lichtenheld Ferdinand Cornelissen +Fabien Lavignotte Fabien Dachicourt -Ewe Woessner Emmanuel Roche Edmond Gheury Ed Ralston diff --git a/applications/osgversion/osgversion.cpp b/applications/osgversion/osgversion.cpp index 4029c14be..09e40e69f 100644 --- a/applications/osgversion/osgversion.cpp +++ b/applications/osgversion/osgversion.cpp @@ -249,11 +249,7 @@ std::string typoCorrection(const std::string& name) if (name=="Antione") return "Antoine"; if (name=="Antonoine") return "Antoine"; if (name=="Atr") return "Art"; - if (name=="Osfeld") return "Osfield"; - if (name=="Rucard") return "Richard"; if (name=="Baverage") return "Beverage"; - if (name=="Lagrade") return "Lagarde"; - if (name=="Lucas") return "Luaces"; if (name=="Bistroviae") return "Bistrovic"; if (name=="Callue") return "Callu"; if (name=="Christaiansen") return "Christiansen"; @@ -272,8 +268,8 @@ std::string typoCorrection(const std::string& name) if (name=="Fredrick") return "Frederic"; if (name=="Fredric") return "Frederic"; if (name=="Froechlich") return "Fröhlich"; - if (name=="Froehlich") return "Fröhlich"; if (name=="Froehilch") return "Fröhlich"; + if (name=="Froehlich") return "Fröhlich"; if (name=="Froelich") return "Fröhlich"; if (name=="Froenlich") return "Fröhlich"; if (name=="Fröhlich") return "Fröhlich"; @@ -283,15 +279,13 @@ std::string typoCorrection(const std::string& name) if (name=="Garret") return "Garrett"; if (name=="Geof") return "Geoff"; if (name=="Giatan") return "Gaitan"; - if (name=="Rolad") return "Roland"; if (name=="Gronenger") return "Gronager"; if (name=="Gronger") return "Gronager"; if (name=="Hebelin") return "Herbelin"; - if (name=="Wedner") return "Weidner"; + if (name=="Heirtlein") return "Hertlein"; + if (name=="Heirtlein") return "Hertlein"; + if (name=="Heirtlein") return "Hertlein"; if (name=="Hertleinm") return "Hertlein"; - if (name=="Heirtlein") return "Hertlein"; - if (name=="Heirtlein") return "Hertlein"; - if (name=="Heirtlein") return "Hertlein"; if (name=="Hertlien") return "Hertlein"; if (name=="Hi") return "He"; if (name=="Hooper") return "Hopper"; @@ -310,14 +304,16 @@ std::string typoCorrection(const std::string& name) if (name=="J") return "José"; if (name=="Keuhne") return "Kuehne"; if (name=="Kheune") return "Kuehne"; + if (name=="Lagrade") return "Lagarde"; if (name=="Larshkari") return "Lashkari"; if (name=="Lashakari") return "Lashkari"; if (name=="Lashari") return "Lashkari"; if (name=="Lasharki") return "Lashkari"; if (name=="Laskari") return "Lashkari"; if (name=="Leandowski" || name=="Lawandowski") return "Lewandowski"; - if (name=="Lweandowski") return "Lewandowski"; + if (name=="Lucas") return "Luaces"; if (name=="Lugi") return "Luigi"; + if (name=="Lweandowski") return "Lewandowski"; if (name=="Machler") return "Mächler"; if (name=="Macro") return "Marco"; if (name=="Maechler") return "Mächler"; @@ -343,12 +339,16 @@ std::string typoCorrection(const std::string& name) if (name=="Olad") return "Olaf"; if (name=="Olar") return "Olaf"; if (name=="Oritz") return "Ortiz"; + if (name=="Osfeld") return "Osfield"; if (name=="Osfied") return "Osfield"; if (name=="Pail") return "Paul"; if (name=="Rajce") return "Trajce"; if (name=="Randal") return "Randall"; if (name=="Robet") return "Robert"; if (name=="Rodger") return "Roger"; + if (name=="Rolad") return "Roland"; + if (name=="Rucard") return "Richard"; + if (name=="Sekender") return "Sukender"; if (name=="Sewel") return "Sewell"; if (name=="Simmonson") return "Simonsson"; if (name=="Simmonsson") return "Simonsson"; @@ -369,16 +369,18 @@ std::string typoCorrection(const std::string& name) if (name=="Takehei") return "Takahei"; if (name=="Tarantilils") return "Tarantilis"; if (name=="Trastenjak") return "Trstenjak"; + if (name=="Urlich") return "Ulrich"; if (name=="Vines") return "Vine"; if (name=="Waldrom") return "Waldron"; + if (name=="Wedner") return "Weidner"; if (name=="Weidemann") return "Wiedemann"; if (name=="Wieblen") return "Weiblen"; + if (name=="Woesnner") return "Woessner"; if (name=="Wojiech" || name=="Wojchiech") return "Wojciech"; if (name=="Xennon") return "Hanson"; if (name=="Yefrei") return "Yefei"; if (name=="Yfei") return "Yefei"; - if (name=="Urlich") return "Ulrich"; - + if (name=="Jean-Sebastein") return "Jean-Sebastien"; return name; } @@ -390,12 +392,24 @@ void nameCorrection(NamePair& name) name.second = "Hein"; } + if (name.first=="Mattias" && name.second=="Fröhlich") + { + name.first = "Mathias"; + name.second = "Fröhlich"; + } + + if (name.first=="Mathias" && name.second=="Helsing") + { + name.first = "Mattias"; + name.second = "Helsing"; + } + if (name.first=="Bjorn" && name.second=="Hein") { name.first = "Björn"; name.second = "Hein"; } - + if (name.first=="Erik" && name.second=="van") { name.first = "Erik";