Change to Andreas Jochens patch for Debian bugs #358474/#359690

[synfig.git] / synfig-core / trunk / src / modules / mod_ppm / trgt_ppm.cpp

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 1477aa8..c349585 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp
+++ b/synfig-core/trunk/src/modules/mod_ppm/trgt_ppm.cpp
@@ -1,18 +1,19 @@
 /*! ========================================================================
-** Sinfg
+** Synfig
 ** ppm Target Module
 ** $Id: trgt_ppm.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"
@@ -30,7 +31,7 @@
 #endif
 
 #include "trgt_ppm.h"
-#include <sinfg/sinfg.h>
+#include <synfig/synfig.h>
 #include <ETL/stringf>
 #include <cstdio>
 #include <algorithm>
@@ -39,17 +40,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(ppm);
-SINFG_TARGET_SET_NAME(ppm,"ppm");
-SINFG_TARGET_SET_EXT(ppm,"ppm");
-SINFG_TARGET_SET_VERSION(ppm,"0.1");
-SINFG_TARGET_SET_CVS_ID(ppm,"$Id: trgt_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_TARGET_INIT(ppm);
+SYNFIG_TARGET_SET_NAME(ppm,"ppm");
+SYNFIG_TARGET_SET_EXT(ppm,"ppm");
+SYNFIG_TARGET_SET_VERSION(ppm,"0.1");
+SYNFIG_TARGET_SET_CVS_ID(ppm,"$Id: trgt_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
 
 /* === M E T H O D S ======================================================= */
 
@@ -88,7 +89,7 @@ ppm::end_frame()
 }
 
 bool
-ppm::start_frame(sinfg::ProgressCallback *callback)
+ppm::start_frame(synfig::ProgressCallback *callback)
 {
        int w=desc.get_w(),h=desc.get_h();