X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftags%2Fstable%2Fsrc%2Fmodules%2Fmod_png%2Ftrgt_png.cpp;h=bc38548939dd8862c301f896113450fd4f739e7f;hb=20067bb96af6946754e7ecb7b40673b818f6e5c2;hp=09c2152efa39506b31133e3c3a93f89ec9c9eaa8;hpb=684cf1db661a9a5cbc142238cf05d6d2f7aa3f89;p=synfig.git

diff --git a/synfig-core/tags/stable/src/modules/mod_png/trgt_png.cpp b/synfig-core/tags/stable/src/modules/mod_png/trgt_png.cpp
index 09c2152..bc38548 100644
--- a/synfig-core/tags/stable/src/modules/mod_png/trgt_png.cpp
+++ b/synfig-core/tags/stable/src/modules/mod_png/trgt_png.cpp
@@ -140,18 +140,15 @@ png_trgt::start_frame(synfig::ProgressCallback *callback)
 	}
 	else if(multi_image)
 	{
-		String
-			newfilename(filename),
-			ext(find(filename.begin(),filename.end(),'.'),filename.end());
-		newfilename.erase(find(newfilename.begin(),newfilename.end(),'.'),newfilename.end());
-
-		newfilename+=etl::strprintf("%04d",imagecount)+ext;
-		file=fopen(newfilename.c_str(),"wb");
+		String newfilename(filename_sans_extension(filename) +
+						   etl::strprintf(".%04d",imagecount) +
+						   filename_extension(filename));
+		file=fopen(newfilename.c_str(),POPEN_BINARY_WRITE_TYPE);
 		if(callback)callback->task(newfilename);
 	}
 	else
 	{
-		file=fopen(filename.c_str(),"wb");
+		file=fopen(filename.c_str(),POPEN_BINARY_WRITE_TYPE);
 		if(callback)callback->task(filename);
 	}
 
@@ -201,17 +198,22 @@ png_trgt::start_frame(synfig::ProgressCallback *callback)
 	// Write the physical size
 	png_set_pHYs(png_ptr,info_ptr,round_to_int(desc.get_x_res()),round_to_int(desc.get_y_res()),PNG_RESOLUTION_METER);
 
+	char title      [] = "Title";
+	char description[] = "Description";
+	char software   [] = "Software";
+	char synfig     [] = "SYNFIG";
+//	char copyright  [] = "Copyright";
+//	char voria      [] = "(c) 2004 Voria Studios, LLC";
+
 	// Output any text info along with the file
 	png_text comments[]=
 	{
-		{ PNG_TEXT_COMPRESSION_NONE, "Title", const_cast<char *>(get_canvas()->get_name().c_str()),
+		{ PNG_TEXT_COMPRESSION_NONE, title, const_cast<char *>(get_canvas()->get_name().c_str()),
 		  strlen(get_canvas()->get_name().c_str()) },
-		{ PNG_TEXT_COMPRESSION_NONE, "Description", const_cast<char *>(get_canvas()->get_description().c_str()),
+		{ PNG_TEXT_COMPRESSION_NONE, description, const_cast<char *>(get_canvas()->get_description().c_str()),
 		  strlen(get_canvas()->get_description().c_str()) },
-//		{ PNG_TEXT_COMPRESSION_NONE, "Copyright", "(c) 2004 Voria Studios, LLC",
-//		  strlen("(c) 2004 Voria Studios, LLC") },
-		{ PNG_TEXT_COMPRESSION_NONE, "Software", "SYNFIG",
-		  strlen("SYNFIG") },
+//		{ PNG_TEXT_COMPRESSION_NONE, copyright, voria, strlen(voria) },
+		{ PNG_TEXT_COMPRESSION_NONE, software, synfig, strlen(synfig) },
 	};
 	png_set_text(png_ptr,info_ptr,comments,sizeof(comments)/sizeof(png_text));