Fix 1818856: External application render targets seem to be broken. We can't use...

[synfig.git] / synfig-core / trunk / src / modules / mod_png / trgt_png.cpp

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 1f2a37f..e2646be 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp
+++ b/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp
@@ -6,6 +6,7 @@
 **
 **     \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
@@ -139,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);
        }
 
@@ -203,10 +201,14 @@ png_trgt::start_frame(synfig::ProgressCallback *callback)
        // 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));
 
@@ -217,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;
 }