----- Carlos R. Mafra <[email protected]> a écrit : > Hi Christophe, > > I did some major surgery in the #next branch. I hope to not have > created a big mess. > > [...] > > So a lot of things have been done. I still have patches I think were not > addressed and still need to be added again: > > 0003-wrlib-WEBP-header-fixes.patch > 0005-Fixed-unknown-image-format-detection-in-Icon-Chooser.patch > 0006-wrlib-added-support-for-imagemagick-third-party-lib.patch > 0007-wrlib-Added-clean-functions-to-wrlib.patch > > But I'd like to ask people to check the end result on #next first (just > make a backup branch before pulling the changes). > > Thanks a lot Christophe! I hope I didn't mess too much with your work.
Hi Carlos, So far, everything looks ok on my side! I hope it was not too much of a chore on your side! I think that '0003-wrlib-WEBP-header-fixes' is already applied because it looks to be part of the WebP commit in the current #next from what I can see; The patch '0007-wrlib-Added-clean-functions-to-wrlib' would deserve some feedback too (that means: expect a diff patch if you import it in #next, or ask for an alternate version now, or if David prefers I can make the comments and let him propose the new version of the patch); As raised by David, there's also the case of '0001-wrlib-added-missing-call-to-deallocate-magick-pixelw' which I think would gain from being amended to the ImageMagick patch. Regards, Christophe. > On Wed, 16 Apr 2014 at 22:29:43 +0200, Christophe wrote: > > Hello, > > > > These 7 patchs bring a number of improvements I proposed to the > > original patch from David: > > > > - patch 1: reverts a few things that are not related to the patch's function > > and that are re-added separateley through patch 4 and 6. This patch is > > supposed > > to be amended to 3c531e4878c1a4b8201dc9f71dd942c799c16503; > > > > - patch 2: import changes that were made in the later commit > > b2a02a04a6e9e404dbcb52bb6377751962d8574e where it is out of place. This > > patch > > is also supposed to be amended; > > > > - patch 3: adds the improvments to image detection format, and is also > > supposed > > to be amended; > > > > - patch 4: re-adds the initial image detection improvements by David. This > > is > > supposed to be a separate commit because it is unrelated to PPM; > > > > - patch 5: proposes some improvements on the signatures used for images > > detection. This patch is supposed to be amended to patch 4; > > > > - patch 6: re-adds the initial improvements by David on WRaster examples. > > This is > > supposed to be a separate commit because it is unrelated to previous > > changes; > > > > - patch 7: propose a so small improvement that is should obviously be > > amended > > to previous patch 6. > > > > > > Please note that while rebasing to #next's top this will break this commit: > > > > b2a02a0... wrlib: Added support for webp image > > - 4 lines of include <png.h> are removed, > > - change in size of 'buffer' that was not kept > > > > > > This also means that I'll have to wait until this conflict has been resolved > > on #next before send the diffs for WebP if I want them to apply easily. > > > > Regards, > > Christophe. > > > > > > > > wrlib/load.c | 30 ++++++++++------ > > wrlib/load_ppm.c | 93 > > ++++++++++++++++++++++++++++++++++---------------- > > wrlib/tests/testdraw.c | 1 + > > 3 files changed, 84 insertions(+), 40 deletions(-) > > > > -- > > 1.9.1 > > > > > > -- > > To unsubscribe, send mail to [email protected]. > > > -- > To unsubscribe, send mail to [email protected]. -- To unsubscribe, send mail to [email protected].
