X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_ppm%2Fmptr_ppm.cpp;h=6900c937e0e730f5c04c32898f53fee83bce636e;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=c6f18a4cf7561455166b926045ccce95ccc2cec2;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp b/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp
index c6f18a4..6900c93 100644
--- a/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp
+++ b/synfig-core/trunk/src/modules/mod_ppm/mptr_ppm.cpp
@@ -1,18 +1,22 @@
-/*! ========================================================================
-** Sinfg
-** ppm Target Module
-** $Id: mptr_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file mptr_ppm.cpp
+**	\brief ppm Target Module
 **
-** 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 ===========================================================
 **
@@ -28,11 +32,11 @@
 #endif
 
 #include "mptr_ppm.h"
-#include <sinfg/importer.h>
-#include <sinfg/time.h>
-#include <sinfg/surface.h>
-#include <sinfg/general.h>
-#include <sinfg/smartfile.h>
+#include <synfig/importer.h>
+#include <synfig/time.h>
+#include <synfig/surface.h>
+#include <synfig/general.h>
+#include <synfig/smartfile.h>
 
 #include <cstdio>
 #include <algorithm>
@@ -42,17 +46,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_IMPORTER_INIT(ppm_mptr);
-SINFG_IMPORTER_SET_NAME(ppm_mptr,"ppm_mptr");
-SINFG_IMPORTER_SET_EXT(ppm_mptr,"ppm");
-SINFG_IMPORTER_SET_VERSION(ppm_mptr,"0.1");
-SINFG_IMPORTER_SET_CVS_ID(ppm_mptr,"$Id: mptr_ppm.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_IMPORTER_INIT(ppm_mptr);
+SYNFIG_IMPORTER_SET_NAME(ppm_mptr,"ppm");
+SYNFIG_IMPORTER_SET_EXT(ppm_mptr,"ppm");
+SYNFIG_IMPORTER_SET_VERSION(ppm_mptr,"0.1");
+SYNFIG_IMPORTER_SET_CVS_ID(ppm_mptr,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -66,28 +70,28 @@ ppm_mptr::~ppm_mptr()
 }
 
 bool
-ppm_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb)
+ppm_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb)
 {
 	SmartFILE file(fopen(filename.c_str(),"rb"));
 	if(!file)
 	{
-		if(cb)cb->error("pp_mptr::GetFrame(): "+strprintf(_("Unable to open %s"),filename.c_str())); 
+		if(cb)cb->error("pp_mptr::GetFrame(): "+strprintf(_("Unable to open %s"),filename.c_str()));
 		return false;
 	}
 	int w,h;
 	float divisor;
-	
+
 	if(fgetc(file.get())!='P' || fgetc(file.get())!='6')
 	{
-		if(cb)cb->error("pp_mptr::GetFrame(): "+strprintf(_("%s was not in PPM format"),filename.c_str())); 
+		if(cb)cb->error("pp_mptr::GetFrame(): "+strprintf(_("%s was not in PPM format"),filename.c_str()));
 		return false;
 	}
-	
+
 	fgetc(file.get());
 	fscanf(file.get(),"%d %d\n",&w,&h);
 	fscanf(file.get(),"%f",&divisor);
 	fgetc(file.get());
-	
+
 	int x;
 	int y;
 	surface.set_wh(w,h);