Hi Adrian, I realized my mistake sortly after submitting the partial merge. Once I spotted the error I completed the merge and checked in the full submission.
Robert. On Fri, May 27, 2011 at 12:03 PM, Adrian Egli OpenSceneGraph (3D) <[email protected]> wrote: > Hi Robert, > > The pnm plugin is broken: VC2005 was broken > Error 1 error C2988: unrecognizable template > declaration/definition > f:\dev\OpenSceneGraph\OpenSceneGraphSVN\src\osgPlugins\pnm\ReaderWriterPNM.cpp > 57 > Error 2 error C2059: syntax error : '<end > Parse>' > f:\dev\OpenSceneGraph\OpenSceneGraphSVN\src\osgPlugins\pnm\ReaderWriterPNM.cpp > 57 > Error 3 error C2143: syntax error : missing ';' before > '{' > f:\dev\OpenSceneGraph\OpenSceneGraphSVN\src\osgPlugins\pnm\ReaderWriterPNM.cpp > 60 > Error 4 error C2447: '{' : missing function header (old-style formal > list?) > f:\dev\OpenSceneGraph\OpenSceneGraphSVN\src\osgPlugins\pnm\ReaderWriterPNM.cpp > 60 > > after the SVN Update, it works now fine > > Thank you > Adrian > > > 2011/5/27 Robert Osfield <[email protected]>: >> Thanks Eric, changes now merged and submitted to svn/trunk. >> >> On Tue, May 24, 2011 at 3:27 PM, Eric Sokolowsky <[email protected]> wrote: >>> Attached is an updated PNM plugin for inclusion in both the trunk and for >>> release version 2.8.5. The attached file fixes numerous bugs in reading >>> 8-bit and 16-bit images, including loading the images upside-down. This file >>> also incorporates trunk patch r12220 which updated the plugin for reading >>> and writing images through streams instead of C-style FILE I/O. Since the >>> PNM plugin had not been changed in trunk since r12220 this file is suitable >>> for both trunk and 2.8. >>> >>> Eric >>> >>> _______________________________________________ >>> osg-submissions mailing list >>> [email protected] >>> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >>> >>> >> _______________________________________________ >> osg-submissions mailing list >> [email protected] >> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org >> > > > > -- > ******************************************** > Adrian Egli > _______________________________________________ > osg-submissions mailing list > [email protected] > http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org > _______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
