Thanks Pjotr, fix merged and submitted to svn/trunk. On 20 November 2014 08:32, Pjotr Svetachov <[email protected]> wrote:
> Hi Robert, > > This change breaks compiling against giflib 5.0 because DGifCloseFile only > has two parameters starting from giflib 5.1. I have attached a fix. > > Cheers, > Pjotr > > > > On 19 November 2014 18:35, Robert Osfield <[email protected]> > wrote: > >> HI Clement, >> >> Sorry for the slow reply, taken a submissions sabatical this autumn. I >> have now merged your changes and checked them into svn/trunk and OSG-3.2 >> branch. >> >> Sending whole files is the most efficient way for me to manage >> submissions. When I merge I graphically diff the files to review the >> changes and if appropriate merge them, or adapt if required. Typically >> removing/moving files isn't something that has been an big issue to tackle >> - most submissions are simply one or two line changes. More complex >> submissions requiring more effort to merge is fine as these also require >> more effort to review properly. It's the review process this is the >> critical part with submissions so getting them in a form so they can be >> properly reviewed is the key to success. >> >> Robert. >> >> On 13 August 2014 13:24, Clément Boesch <[email protected]> wrote: >> >>> Hi, >>> >>> Following [1], I'm attaching the src/osgPlugins/gif/ReaderWriterGIF.cpp >>> file updated with the following diff: >>> >>> diff --git a/src/osgPlugins/gif/ReaderWriterGIF.cpp >>> b/src/osgPlugins/gif/ReaderWriterGI >>> index b7f228d..ac89f8e 100644 >>> --- a/src/osgPlugins/gif/ReaderWriterGIF.cpp >>> +++ b/src/osgPlugins/gif/ReaderWriterGIF.cpp >>> @@ -561,7 +561,11 @@ GifImageStream** obj) >>> *width_ret = giffile->SWidth; >>> *height_ret = giffile->SHeight; >>> *numComponents_ret = 4; >>> +#if (GIFLIB_MAJOR >= 5) >>> + DGifCloseFile(giffile, &Error); >>> +#else >>> DGifCloseFile(giffile); >>> +#endif >>> return buffer; >>> } >>> >>> This is in the continuation of a previous commit (37b8ad60 on the git >>> mirror, >>> not sure about the related SVN revision) and is required to allow the >>> file to >>> compile. >>> >>> I hope I'm following the correct way of submitting patches, although >>> that's >>> kind of problematic for patches that typically need to move or delete >>> files. >>> >>> I saw some merge requests on the Github: this could simplify a lot the >>> workflow, is that OK to use it instead of submitting files here? >>> >>> Also, I have a few patches locally which are hacks to workaround >>> issues. I'd >>> like to submit them (even though they're obviously not ready for >>> inclusion) in >>> order to discuss the changes; is that the correct place, or should I >>> refer to >>> the forum or another mailing-list? >>> >>> Last question, the IRC channel looks dead (2 people standing there, >>> including >>> me); I guess there is no other place for instant chat? Again, for >>> development >>> on OSG, not for API user questions. >>> >>> Best Regards, >>> >>> [1]: >>> http://www.openscenegraph.org/index.php/community/submission-protocol >>> >>> -- >>> Clément B. >>> >>> _______________________________________________ >>> 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 >> >> > > _______________________________________________ > 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
