X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_png%2Ftrgt_png.cpp;h=9b26f506058c4e7847df3c8c0724298e16d7466f;hb=ba24cb7df04d015c3e3ecd0c4b234f64646a3618;hp=670a1eccd2331978412f4bc26cd3fb9c55642efc;hpb=21bfc670b83d4c45da9ed1b95063b7e6a007168c;p=synfig.git

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 670a1ec..9b26f50 100644
--- a/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp
+++ b/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp
@@ -1,9 +1,12 @@
-/*! ========================================================================
-** Synfig
-** png_trgt Target Module
-** $Id: trgt_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file trgt_png.cpp
+**	\brief png_trgt Target Module
 **
+**	$Id$
+**
+**	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 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
@@ -14,6 +17,7 @@
 **	but WITHOUT ANY WARRANTY; without even the implied warranty of
 **	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 **	General Public License for more details.
+**	\endlegal
 **
 ** === N O T E S ===========================================================
 **
@@ -52,7 +56,7 @@ SYNFIG_TARGET_INIT(png_trgt);
 SYNFIG_TARGET_SET_NAME(png_trgt,"png");
 SYNFIG_TARGET_SET_EXT(png_trgt,"png");
 SYNFIG_TARGET_SET_VERSION(png_trgt,"0.1");
-SYNFIG_TARGET_SET_CVS_ID(png_trgt,"$Id: trgt_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_TARGET_SET_CVS_ID(png_trgt,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -81,7 +85,7 @@ png_trgt::png_trgt(const char *Filename)
 	filename=Filename;
 	buffer=NULL;
 	ready=false;
-	color_buffer=0;	
+	color_buffer=0;
 }
 
 png_trgt::~png_trgt()
@@ -126,7 +130,7 @@ bool
 png_trgt::start_frame(synfig::ProgressCallback *callback)
 {
 	int w=desc.get_w(),h=desc.get_h();
-	
+
 	if(file && file!=stdout)
 		fclose(file);
 	if(filename=="-")
@@ -136,24 +140,21 @@ 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);
 	}
-	
+
 	if(!file)
 		return false;
-		
+
 	delete [] buffer;
 	buffer=new unsigned char[4*w];
 
@@ -167,7 +168,7 @@ png_trgt::start_frame(synfig::ProgressCallback *callback)
 		fclose(file);
 		return false;
 	}
-	
+
 	info_ptr= png_create_info_struct(png_ptr);
 	if (!info_ptr)
 	{
@@ -176,7 +177,7 @@ png_trgt::start_frame(synfig::ProgressCallback *callback)
 		png_destroy_write_struct(&png_ptr,(png_infopp)NULL);
 		return false;
 	}
-	
+
 	if (setjmp(png_jmpbuf(png_ptr)))
 	{
 		synfig::error("Unable to setup longjump");
@@ -193,20 +194,24 @@ png_trgt::start_frame(synfig::ProgressCallback *callback)
 	// Write the gamma
 	//png_set_gAMA(png_ptr, info_ptr,1.0/gamma().get_gamma());
 	png_set_gAMA(png_ptr, info_ptr,gamma().get_gamma());
-	
+
 	// 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);
-	
+
 	// 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, "Description", const_cast<char *>(get_canvas()->get_description().c_str()) },
-		{ PNG_TEXT_COMPRESSION_NONE, "Copyright", "(c) 2004 Voria Studios, LLC" },
-		{ PNG_TEXT_COMPRESSION_NONE, "Software", "SYNFIG" },
+		{ 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()),
+		  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_set_text(png_ptr,info_ptr,comments,sizeof(comments)/sizeof(png_text));
-	
+
 	png_write_info_before_PLTE(png_ptr, info_ptr);
 	png_write_info(png_ptr, info_ptr);
 	ready=true;
@@ -214,7 +219,7 @@ png_trgt::start_frame(synfig::ProgressCallback *callback)
 }
 
 Color *
-png_trgt::start_scanline(int scanline)
+png_trgt::start_scanline(int /*scanline*/)
 {
 	return color_buffer;
 }