X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_magickpp%2Ftrgt_magickpp.cpp;h=875f2b5da8ffc99538fc8167d3c65f0c3f42489e;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=7ddaee940d33571f35610ecf87c39c78430e8a99;hpb=ee37342d0af3ee5a41340f76f347fa476765205e;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.cpp b/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.cpp index 7ddaee9..875f2b5 100644 --- a/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.cpp +++ b/synfig-core/trunk/src/modules/mod_magickpp/trgt_magickpp.cpp @@ -5,7 +5,7 @@ ** $Id$ ** ** \legal -** Copyright 2007 Chris Moore +** Copyright (c) 2007, 2008 Chris Moore ** ** This package is free software; you can redistribute it and/or ** modify it under the terms of the GNU General Public License as @@ -64,14 +64,23 @@ MagickLib::Image* copy_image_list(Container& container) MagickLib::GetExceptionInfo(&exceptionInfo); for (Iter iter = container.begin(); iter != container.end(); ++iter) { - MagickLib::Image* current = CloneImage(iter->image(), 0, 0, Magick::MagickTrue, &exceptionInfo); - if (!first) first = current; + MagickLib::Image* current; - current->previous = previous; - current->next = 0; + try + { + current = CloneImage(iter->image(), 0, 0, Magick::MagickTrue, &exceptionInfo); - if ( previous != 0) previous->next = current; - previous = current; + if (!first) first = current; + + current->previous = previous; + current->next = 0; + + if ( previous != 0) previous->next = current; + previous = current; + } + catch(Magick::Warning warning) { + synfig::warning("exception '%s'", warning.what()); + } } return first; @@ -82,67 +91,130 @@ magickpp_trgt::~magickpp_trgt() MagickLib::ExceptionInfo exceptionInfo; MagickLib::GetExceptionInfo(&exceptionInfo); - // check whether this file format supports multiple-image files - Magick::Image image(*(images.begin())); - image.fileName(filename); - SetImageInfo(image.imageInfo(),Magick::MagickTrue,&exceptionInfo); - - // the file type is now in image.imageInfo()->magick and - // image.adjoin() tells us whether we can write to a single file - if (image.adjoin()) + try { - synfig::info("joining images"); - unsigned int delay = round_to_int(100.0 / desc.get_frame_rate()); - for_each(images.begin(), images.end(), Magick::animationDelayImage(delay)); + bool multiple_images = images.size() != 1; + bool can_adjoin = false; + + if (multiple_images) + { + // check whether this file format supports multiple-image files + Magick::Image image(*(images.begin())); + image.fileName(filename); + try + { + SetImageInfo(image.imageInfo(),Magick::MagickTrue,&exceptionInfo); + can_adjoin = image.adjoin(); + } + catch(Magick::Warning warning) { + synfig::warning("exception '%s'", warning.what()); + } + } + + // the file type is now in image.imageInfo()->magick and + // image.adjoin() tells us whether we can write to a single file + if (can_adjoin) + { + synfig::info("joining images"); + unsigned int delay = round_to_int(100.0 / desc.get_frame_rate()); + for_each(images.begin(), images.end(), Magick::animationDelayImage(delay)); - // optimize the images (only write the pixels that change from frame to frame + // optimize the images (only write the pixels that change from frame to frame #ifdef HAVE_MAGICK_OPTIMIZE - // make a completely new image list - // this is required because: - // RemoveDuplicateLayers wants a linked list of images, and removes some of them - // when it removes an image, it invalidates it using DeleteImageFromList, but we still have it in our container - // when we destroy our container, the image is re-freed, failing an assertion + // make a completely new image list + // this is required because: + // RemoveDuplicateLayers wants a linked list of images, and removes some of them + // when it removes an image, it invalidates it using DeleteImageFromList, but we still have it in our container + // when we destroy our container, the image is re-freed, failing an assertion - synfig::info("copying image list"); - MagickLib::Image *image_list = copy_image_list(images); + synfig::info("copying image list"); + MagickLib::Image *image_list = copy_image_list(images); - synfig::info("clearing old image list"); - images.clear(); + synfig::info("clearing old image list"); + images.clear(); - synfig::info("removing duplicate frames"); - RemoveDuplicateLayers(&image_list, &exceptionInfo); + if (!getenv("SYNFIG_DISABLE_REMOVE_DUPS")) + { + synfig::info("removing duplicate frames"); + try + { + RemoveDuplicateLayers(&image_list, &exceptionInfo); + } + catch(Magick::Warning warning) { + synfig::warning("exception '%s'", warning.what()); + } + } - synfig::info("optimizing frames"); - OptimizeImageTransparency(image_list,&exceptionInfo); + if (!getenv("SYNFIG_DISABLE_OPTIMIZE")) + { + synfig::info("optimizing layers"); + try + { + image_list = OptimizeImageLayers(image_list,&exceptionInfo); + } + catch(Magick::Warning warning) { + synfig::warning("exception '%s'", warning.what()); + } + } + + if (!getenv("SYNFIG_DISABLE_OPTIMIZE_TRANS")) + { + synfig::info("optimizing layer transparency"); + try + { + OptimizeImageTransparency(image_list,&exceptionInfo); + } + catch(Magick::Warning warning) { + synfig::warning("exception '%s'", warning.what()); + } + } - synfig::info("recreating image list"); - insertImages(&images, image_list); + synfig::info("recreating image list"); + insertImages(&images, image_list); #else - synfig::info("not optimizing images"); - // DeconstructImages is available in ImageMagic 6.2.* but it doesn't take - // the 'dispose' method into account, so for frames with transparency where - // nothing is moving, we end up with objects disappearing when they shouldn't - - // linkImages(images.begin(), images.end()); - // MagickLib::Image* new_images = DeconstructImages(images.begin()->image(),&exceptionInfo); - // unlinkImages(images.begin(), images.end()); - // images.clear(); - // insertImages(&images, new_images); + synfig::info("not optimizing images"); + // DeconstructImages is available in ImageMagic 6.2.* but it doesn't take + // the 'dispose' method into account, so for frames with transparency where + // nothing is moving, we end up with objects disappearing when they shouldn't + + // linkImages(images.begin(), images.end()); + // MagickLib::Image* new_images = DeconstructImages(images.begin()->image(),&exceptionInfo); + // unlinkImages(images.begin(), images.end()); + // images.clear(); + // insertImages(&images, new_images); #endif + } + else if (multiple_images) + { + // if we can't write multiple images to a file of this type, + // include '%04d' in the filename, so the files will be numbered + // with a fixed width, '0'-padded number + synfig::info("can't join images of this type - numbering instead"); + filename = (filename_sans_extension(filename) + ".%04d" + filename_extension(filename)); + } + + synfig::info("writing %d image%s to %s", images.size(), images.size() == 1 ? "" : "s", filename.c_str()); + try + { + Magick::writeImages(images.begin(), images.end(), filename); + synfig::info("done"); + } + catch(Magick::Warning warning) { + synfig::warning("exception '%s'", warning.what()); + } } - else - { - // if we can't write multiple images to a file of this type, - // include '%04d' in the filename, so the files will be numbered - // with a fixed width, '0'-padded number - synfig::info("can't join images of this type - numbering instead"); - filename = (filename_sans_extension(filename) + ".%04d" + filename_extension(filename)); + catch(Magick::Warning warning) { + synfig::warning("exception '%s'", warning.what()); + } + catch(Magick::Error error) { + synfig::error("exception '%s'", error.what()); + } + catch(...) { + synfig::error("unknown exception"); } - synfig::info("writing %d images to %s", images.size(), filename.c_str()); - Magick::writeImages(images.begin(), images.end(), filename); - - if (buffer != NULL) delete [] buffer; + if (buffer1 != NULL) delete [] buffer1; + if (buffer2 != NULL) delete [] buffer2; if (color_buffer != NULL) delete [] color_buffer; } @@ -159,14 +231,24 @@ magickpp_trgt::init() width = desc.get_w(); height = desc.get_h(); - buffer = new unsigned char[4*width*height]; - if (buffer == NULL) + start_pointer = NULL; + + buffer1 = new unsigned char[4*width*height]; + if (buffer1 == NULL) + return false; + + buffer2 = new unsigned char[4*width*height]; + if (buffer2 == NULL) + { + delete [] buffer1; return false; + } color_buffer = new Color[width]; if (color_buffer == NULL) { - delete [] buffer; + delete [] buffer1; + delete [] buffer2; return false; } @@ -176,22 +258,28 @@ magickpp_trgt::init() void magickpp_trgt::end_frame() { - Magick::Image image(width, height, "RGBA", Magick::CharPixel, buffer); + Magick::Image image(width, height, "RGBA", Magick::CharPixel, start_pointer); if (transparent && images.begin() != images.end()) (images.end()-1)->gifDisposeMethod(Magick::BackgroundDispose); images.push_back(image); } bool -magickpp_trgt::start_frame(synfig::ProgressCallback *callback) +magickpp_trgt::start_frame(synfig::ProgressCallback *callback __attribute__ ((unused))) { - buffer_pointer = buffer; + previous_buffer_pointer = start_pointer; + + if (start_pointer == buffer1) + start_pointer = buffer_pointer = buffer2; + else + start_pointer = buffer_pointer = buffer1; + transparent = false; return true; } Color* -magickpp_trgt::start_scanline(int scanline) +magickpp_trgt::start_scanline(int scanline __attribute__ ((unused))) { return color_buffer; } @@ -199,11 +287,14 @@ magickpp_trgt::start_scanline(int scanline) bool magickpp_trgt::end_scanline() { - convert_color_format(buffer_pointer, color_buffer, width, PF_RGB|PF_A, gamma()); + convert_color_format(buffer_pointer, color_buffer, + width, PF_RGB|PF_A, gamma()); if (!transparent) for (int i = 0; i < width; i++) - if (buffer_pointer[i*4 + 3] < 128) + if (previous_buffer_pointer && // this isn't the first frame + buffer_pointer[i*4 + 3] < 128 && // our pixel is transparent + !(previous_buffer_pointer[i*4 + 3] < 128)) // the previous frame's pixel wasn't { transparent = true; break; @@ -211,5 +302,8 @@ magickpp_trgt::end_scanline() buffer_pointer += 4 * width; + if (previous_buffer_pointer) + previous_buffer_pointer += 4 * width; + return true; }