From 2634f9614b1b0c8278f72acbda44073c02e42fd4 Mon Sep 17 00:00:00 2001 From: dooglus Date: Thu, 25 Oct 2007 18:38:36 +0000 Subject: [PATCH] When rendering to multiple image files, render to filename.NNNN.ext rather than filenameNNNN.ext. When filename itself ends with a number, it's confusing to have the serial number merge with the filename. git-svn-id: http://svn.voria.com/code@972 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp | 2 +- synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp | 2 +- synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp | 2 +- synfig-core/trunk/src/modules/mod_png/trgt_png.cpp | 2 +- synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp index 71a84a7..94834c7 100644 --- a/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp +++ b/synfig-core/trunk/src/modules/mod_bmp/trgt_bmp.cpp @@ -176,7 +176,7 @@ bmp::start_frame(synfig::ProgressCallback *callback) if(multi_image) { String newfilename(filename_sans_extension(filename) + - etl::strprintf("%04d",imagecount) + + etl::strprintf(".%04d",imagecount) + filename_extension(filename)); file=fopen(newfilename.c_str(),POPEN_BINARY_WRITE_TYPE); if(callback)callback->task(newfilename+_(" (animated)")); diff --git a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp index 28994e1..7532fe5 100644 --- a/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp +++ b/synfig-core/trunk/src/modules/mod_jpeg/trgt_jpeg.cpp @@ -110,7 +110,7 @@ jpeg_trgt::start_frame(synfig::ProgressCallback *callback) else if(multi_image) { String newfilename(filename_sans_extension(filename) + - etl::strprintf("%04d",imagecount) + + etl::strprintf(".%04d",imagecount) + filename_extension(filename)); file=fopen(newfilename.c_str(),POPEN_BINARY_WRITE_TYPE); if(callback)callback->task(newfilename); diff --git a/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp b/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp index 3cb0a46..ccfa576 100644 --- a/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp +++ b/synfig-core/trunk/src/modules/mod_openexr/trgt_openexr.cpp @@ -114,7 +114,7 @@ exr_trgt::start_frame(synfig::ProgressCallback *cb) if(multi_image) { frame_name = (filename_sans_extension(filename) + - etl::strprintf("%04d",imagecount) + + etl::strprintf(".%04d",imagecount) + filename_extension(filename)); if(cb)cb->task(frame_name); } diff --git a/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp b/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp index e2646be..9b26f50 100644 --- a/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp +++ b/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp @@ -141,7 +141,7 @@ png_trgt::start_frame(synfig::ProgressCallback *callback) else if(multi_image) { String newfilename(filename_sans_extension(filename) + - etl::strprintf("%04d",imagecount) + + etl::strprintf(".%04d",imagecount) + filename_extension(filename)); file=fopen(newfilename.c_str(),POPEN_BINARY_WRITE_TYPE); if(callback)callback->task(newfilename); diff --git a/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp b/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp index 14dba1d..8fc4810 100644 --- a/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp +++ b/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp @@ -104,7 +104,7 @@ ppm::start_frame(synfig::ProgressCallback *callback) else if(multi_image) { String newfilename(filename_sans_extension(filename) + - etl::strprintf("%04d",imagecount) + + etl::strprintf(".%04d",imagecount) + filename_extension(filename)); file=SmartFILE(fopen(newfilename.c_str(),POPEN_BINARY_WRITE_TYPE)); if(callback)callback->task(newfilename); -- 2.7.4