Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / modules / mod_ppm / trgt_ppm.h

diff --git a/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.h b/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.h
index 811f63c..f1a5134 100644 (file)
--- a/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.h
+++ b/synfig-core/tags/stable/src/modules/mod_ppm/trgt_ppm.h
@@ -1,18 +1,22 @@
-/*! ========================================================================
-** Sinfg
-** Template Header File
-** $Id: trgt_ppm.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!    \file trgt_ppm.h
+**     \brief Template Header
 **
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     $Id$
 **
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+**     \legal
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-** 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 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.
+**
+**     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.
+**     \endlegal
 **
 ** === N O T E S ===========================================================
 **
@@ -20,14 +24,14 @@
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_TRGT_PPM_H
-#define __SINFG_TRGT_PPM_H
+#ifndef __SYNFIG_TRGT_PPM_H
+#define __SYNFIG_TRGT_PPM_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/target_scanline.h>
-#include <sinfg/string.h>
-#include <sinfg/smartfile.h>
+#include <synfig/target_scanline.h>
+#include <synfig/string.h>
+#include <synfig/smartfile.h>
 #include <cstdio>
 
 /* === M A C R O S ========================================================= */
@@ -36,26 +40,26 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-class ppm : public sinfg::Target_Scanline
+class ppm : public synfig::Target_Scanline
 {
-       SINFG_TARGET_MODULE_EXT
+       SYNFIG_TARGET_MODULE_EXT
 
 private:
        int imagecount;
        bool multi_image;
-       sinfg::SmartFILE file;
-       sinfg::String filename;
-       sinfg::Color *color_buffer;
+       synfig::SmartFILE file;
+       synfig::String filename;
+       synfig::Color *color_buffer;
        unsigned char *buffer;
 public:
        ppm(const char *filename);
        virtual ~ppm();
 
-       virtual bool set_rend_desc(sinfg::RendDesc *desc);
-       virtual bool start_frame(sinfg::ProgressCallback *cb);
+       virtual bool set_rend_desc(synfig::RendDesc *desc);
+       virtual bool start_frame(synfig::ProgressCallback *cb);
        virtual void end_frame();
 
-       virtual sinfg::Color * start_scanline(int scanline);
+       virtual synfig::Color * start_scanline(int scanline);
        virtual bool end_scanline();
 };