X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_png%2Fmptr_png.cpp;h=1ab33b59fd0af0b219aeb0880bc705a7510e54f2;hb=4c003ac49046e06b6d9a31b38707f921830ea41b;hp=4bfc6deb395fa84495def0ea6b3dbc8dba22885e;hpb=16b3beced25134bef064705568ecb893a6be4e79;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp
index 4bfc6de..1ab33b5 100644
--- a/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp
+++ b/synfig-core/trunk/src/modules/mod_png/mptr_png.cpp
@@ -1,18 +1,19 @@
 /*! ========================================================================
-** Sinfg
+** Synfig
 ** ppm Target Module
 ** $Id: mptr_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 ===========================================================
 **
@@ -34,9 +35,9 @@
 #endif
 
 #include "mptr_png.h"
-#include <sinfg/importer.h>
-#include <sinfg/time.h>
-#include <sinfg/general.h>
+#include <synfig/importer.h>
+#include <synfig/time.h>
+#include <synfig/general.h>
 
 
 #include <cstdio>
@@ -46,7 +47,7 @@
 
 /* === M A C R O S ========================================================= */
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 
@@ -54,11 +55,11 @@ using namespace etl;
 
 /* === G L O B A L S ======================================================= */
 
-SINFG_IMPORTER_INIT(png_mptr);
-SINFG_IMPORTER_SET_NAME(png_mptr,"png_mptr");
-SINFG_IMPORTER_SET_EXT(png_mptr,"png");
-SINFG_IMPORTER_SET_VERSION(png_mptr,"0.1");
-SINFG_IMPORTER_SET_CVS_ID(png_mptr,"$Id: mptr_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_IMPORTER_INIT(png_mptr);
+SYNFIG_IMPORTER_SET_NAME(png_mptr,"png_mptr");
+SYNFIG_IMPORTER_SET_EXT(png_mptr,"png");
+SYNFIG_IMPORTER_SET_VERSION(png_mptr,"0.1");
+SYNFIG_IMPORTER_SET_CVS_ID(png_mptr,"$Id: mptr_png.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
 
 /* === M E T H O D S ======================================================= */
 
@@ -66,7 +67,7 @@ void
 png_mptr::png_out_error(png_struct *png_data,const char *msg)
 {
 	//png_mptr *me=(png_mptr*)png_data->error_ptr;
-	sinfg::error(strprintf("png_mptr: error: %s",msg));
+	synfig::error(strprintf("png_mptr: error: %s",msg));
 	//me->ready=false;
 }
 
@@ -74,7 +75,7 @@ void
 png_mptr::png_out_warning(png_struct *png_data,const char *msg)
 {
 	//png_mptr *me=(png_mptr*)png_data->error_ptr;
-	sinfg::warning(strprintf("png_mptr: warning: %s",msg));
+	synfig::warning(strprintf("png_mptr: warning: %s",msg));
 	//me->ready=false;
 }
 
@@ -161,7 +162,7 @@ png_mptr::png_mptr(const char *file_name)
 	double fgamma;
 	if (png_get_gAMA(png_ptr, info_ptr, &fgamma))
 	{
-		sinfg::info("PNG: Image gamma is %f",fgamma);
+		synfig::info("PNG: Image gamma is %f",fgamma);
 		png_set_gamma(png_ptr, gamma().get_gamma(), fgamma);
 	}
 	
@@ -169,7 +170,7 @@ png_mptr::png_mptr(const char *file_name)
 	/*
 	if (setjmp(png_jmpbuf(png_ptr)))
 	{
-		sinfg::error("Unable to setup longjump");
+		synfig::error("Unable to setup longjump");
 		png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
 		fclose(file);
         //! \todo THROW SOMETHING
@@ -279,7 +280,7 @@ png_mptr::png_mptr(const char *file_name)
 		break;
 
 	case PNG_COLOR_TYPE_PALETTE:
-		sinfg::warning("png_mptr: Paletted PNGs aren't yet fully supported.");
+		synfig::warning("png_mptr: Paletted PNGs aren't yet fully supported.");
 		for(y=0;y<surface_buffer.get_h();y++)
 			for(x=0;x<surface_buffer.get_w();x++)
 			{
@@ -295,7 +296,7 @@ png_mptr::png_mptr(const char *file_name)
 			}
 		break;
 	default:
-		sinfg::error("png_mptr: error: Unsupported color type");
+		synfig::error("png_mptr: error: Unsupported color type");
         //! \todo THROW SOMETHING
 		throw String("error on importer construction, *WRITEME*6");
 		return;
@@ -322,7 +323,7 @@ png_mptr::~png_mptr()
 }
 
 bool
-png_mptr::get_frame(sinfg::Surface &surface,Time, sinfg::ProgressCallback *cb)
+png_mptr::get_frame(synfig::Surface &surface,Time, synfig::ProgressCallback *cb)
 {
 	surface.mirror(surface_buffer);
 //	surface=surface_buffer;