X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftags%2Fstable%2Fsrc%2Fmodules%2Fmod_openexr%2Fmptr_openexr.cpp;h=ce4566478828922237f3ab51e0a212bdace91f77;hb=d3408370fc3297609b3aa8d4ff7edf1f238df251;hp=74a3a38c2fd44a2b4bbe04a48124a45ea2e448f8;hpb=46036a57bc1ab5583c5d5c2188e8c52d7682d9d5;p=synfig.git

diff --git a/synfig-core/tags/stable/src/modules/mod_openexr/mptr_openexr.cpp b/synfig-core/tags/stable/src/modules/mod_openexr/mptr_openexr.cpp
index 74a3a38..ce45664 100644
--- a/synfig-core/tags/stable/src/modules/mod_openexr/mptr_openexr.cpp
+++ b/synfig-core/tags/stable/src/modules/mod_openexr/mptr_openexr.cpp
@@ -1,18 +1,22 @@
-/*! ========================================================================
-** Sinfg
-** ppm Target Module
-** $Id: mptr_openexr.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file mptr_openexr.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,7 +32,8 @@
 #endif
 
 #include "mptr_openexr.h"
-#include <sinfg/sinfg.h>
+#include <synfig/general.h>
+#include <synfig/surface.h>
 #include <ETL/stringf>
 #include <cstdio>
 #include <algorithm>
@@ -42,17 +47,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(exr_mptr);
-SINFG_IMPORTER_SET_NAME(exr_mptr,"exr_mptr");
-SINFG_IMPORTER_SET_EXT(exr_mptr,"exr");
-SINFG_IMPORTER_SET_VERSION(exr_mptr,"0.1");
-SINFG_IMPORTER_SET_CVS_ID(exr_mptr,"$Id: mptr_openexr.cpp,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $");
+SYNFIG_IMPORTER_INIT(exr_mptr);
+SYNFIG_IMPORTER_SET_NAME(exr_mptr,"openexr");
+SYNFIG_IMPORTER_SET_EXT(exr_mptr,"exr");
+SYNFIG_IMPORTER_SET_VERSION(exr_mptr,"0.1");
+SYNFIG_IMPORTER_SET_CVS_ID(exr_mptr,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
@@ -66,7 +71,7 @@ exr_mptr::~exr_mptr()
 }
 
 bool
-exr_mptr::get_frame(sinfg::Surface &out_surface,Time, sinfg::ProgressCallback *cb)
+exr_mptr::get_frame(synfig::Surface &out_surface,Time, synfig::ProgressCallback *cb)
 {
     try
     {
@@ -90,7 +95,7 @@ exr_mptr::get_frame(sinfg::Surface &out_surface,Time, sinfg::ProgressCallback *c
 	in.setFrameBuffer (reinterpret_cast<Imf::Rgba *>(in_surface[0]), 1, w);
 
 	in.readPixels (in.dataWindow().min.y, in.dataWindow().max.y);
-	
+
 	int x;
 	int y;
 	out_surface.set_wh(w,h);
@@ -109,9 +114,9 @@ exr_mptr::get_frame(sinfg::Surface &out_surface,Time, sinfg::ProgressCallback *c
 	catch (const std::exception &e)
     {
 		if(cb)cb->error(e.what());
-		else sinfg::error(e.what());
+		else synfig::error(e.what());
 		return false;
     }
 
-	return true;		
+	return true;
 }