X-Git-Url: https://git.pterodactylus.net/?p=synfig.git;a=blobdiff_plain;f=synfig-core%2Fsrc%2Fmodules%2Fmod_png%2Fmptr_png.cpp;h=a436d5041a745e6ad0b1c12dd8b21729a2e2194b;hp=19f82f35880b1edb0b9203134103fbfd1bb82d47;hb=e363493f47683f5ddbba5886206e7765aaeb569e;hpb=a095981e18cc37a8ecc7cd237cc22b9c10329264 diff --git a/synfig-core/src/modules/mod_png/mptr_png.cpp b/synfig-core/src/modules/mod_png/mptr_png.cpp index 19f82f3..a436d50 100644 --- a/synfig-core/src/modules/mod_png/mptr_png.cpp +++ b/synfig-core/src/modules/mod_png/mptr_png.cpp @@ -334,7 +334,7 @@ png_mptr::png_mptr(const char *file_name) trim = false; - if (getenv("SYNFIG_DISABLE_CROP_IMPORTED_IMAGES")) + //if (getenv("SYNFIG_DISABLE_CROP_IMPORTED_IMAGES")) return; switch(color_type) @@ -407,7 +407,7 @@ png_mptr::~png_mptr() } bool -png_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback */*cb*/) +png_mptr::get_frame(synfig::Surface &surface, const synfig::RendDesc &/*renddesc*/, Time, synfig::ProgressCallback */*cb*/) { //assert(0); // shouldn't be called? surface=surface_buffer; @@ -415,7 +415,7 @@ png_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback */*c } bool -png_mptr::get_frame(synfig::Surface &surface,Time, +png_mptr::get_frame(synfig::Surface &surface, const synfig::RendDesc &renddesc, Time, bool &trimmed, unsigned int &width, unsigned int &height, unsigned int &top, unsigned int &left, synfig::ProgressCallback */*cb*/) {