Fix 1525707: fontconfig support patch had extra parentheses. Thanks to Daniel Fort.

[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 279ea56..4259356 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp
+++ b/synfig-core/trunk/src/modules/mod_png/trgt_png.cpp
@@ -1,18 +1,19 @@
 /*! ========================================================================
-** Sinfg
+** Synfig
 ** png_trgt Target Module
 ** $Id: trgt_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     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.
 **
 ** === N O T E S ===========================================================
 **
@@ -20,7 +21,7 @@
 
 /* === H E A D E R S ======================================================= */
 
-#define SINFG_TARGET
+#define SYNFIG_TARGET
 
 #ifdef USING_PCH
 #      include "pch.h"
@@ -41,17 +42,17 @@
 
 /* === M A C R O S ========================================================= */
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_TARGET_INIT(png_trgt);
-SINFG_TARGET_SET_NAME(png_trgt,"png");
-SINFG_TARGET_SET_EXT(png_trgt,"png");
-SINFG_TARGET_SET_VERSION(png_trgt,"0.1");
-SINFG_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_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 $");
 
 /* === M E T H O D S ======================================================= */
 
@@ -59,7 +60,7 @@ void
 png_trgt::png_out_error(png_struct *png_data,const char *msg)
 {
        png_trgt *me=(png_trgt*)png_data->error_ptr;
-       sinfg::error(strprintf("png_trgt: error: %s",msg));
+       synfig::error(strprintf("png_trgt: error: %s",msg));
        me->ready=false;
 }
 
@@ -67,7 +68,7 @@ void
 png_trgt::png_out_warning(png_struct *png_data,const char *msg)
 {
        png_trgt *me=(png_trgt*)png_data->error_ptr;
-       sinfg::warning(strprintf("png_trgt: warning: %s",msg));
+       synfig::warning(strprintf("png_trgt: warning: %s",msg));
        me->ready=false;
 }
 
@@ -122,7 +123,7 @@ png_trgt::end_frame()
 }
 
 bool
-png_trgt::start_frame(sinfg::ProgressCallback *callback)
+png_trgt::start_frame(synfig::ProgressCallback *callback)
 {
        int w=desc.get_w(),h=desc.get_h();
        
@@ -162,7 +163,7 @@ png_trgt::start_frame(sinfg::ProgressCallback *callback)
        png_ptr=png_create_write_struct(PNG_LIBPNG_VER_STRING, (png_voidp)this,png_out_error, png_out_warning);
        if (!png_ptr)
        {
-               sinfg::error("Unable to setup PNG struct");
+               synfig::error("Unable to setup PNG struct");
                fclose(file);
                return false;
        }
@@ -170,7 +171,7 @@ png_trgt::start_frame(sinfg::ProgressCallback *callback)
        info_ptr= png_create_info_struct(png_ptr);
        if (!info_ptr)
        {
-               sinfg::error("Unable to setup PNG info struct");
+               synfig::error("Unable to setup PNG info struct");
                fclose(file);
                png_destroy_write_struct(&png_ptr,(png_infopp)NULL);
                return false;
@@ -178,7 +179,7 @@ png_trgt::start_frame(sinfg::ProgressCallback *callback)
        
        if (setjmp(png_jmpbuf(png_ptr)))
        {
-               sinfg::error("Unable to setup longjump");
+               synfig::error("Unable to setup longjump");
                png_destroy_write_struct(&png_ptr, &info_ptr);
                fclose(file);
                return false;
@@ -201,8 +202,8 @@ png_trgt::start_frame(sinfg::ProgressCallback *callback)
        {
                { 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", "SINFG" },
+//             { PNG_TEXT_COMPRESSION_NONE, "Copyright", "(c) 2004 Voria Studios, LLC" },
+               { PNG_TEXT_COMPRESSION_NONE, "Software", "SYNFIG" },
        };
        png_set_text(png_ptr,info_ptr,comments,sizeof(comments)/sizeof(png_text));