Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / modules / mod_png / mptr_png.h

diff --git a/synfig-core/trunk/src/modules/mod_png/mptr_png.h b/synfig-core/trunk/src/modules/mod_png/mptr_png.h
index 72d2236..b348964 100644 (file)
--- a/synfig-core/trunk/src/modules/mod_png/mptr_png.h
+++ b/synfig-core/trunk/src/modules/mod_png/mptr_png.h
@@ -1,18 +1,22 @@
-/*! ========================================================================
-** Sinfg
-** Template Header File
-** $Id: mptr_png.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!    \file mptr_png.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_MPTR_PNG_H
-#define __SINFG_MPTR_PNG_H
+#ifndef __SYNFIG_MPTR_PNG_H
+#define __SYNFIG_MPTR_PNG_H
 
 /* === H E A D E R S ======================================================= */
 
-#include <sinfg/importer.h>
-#include <sinfg/string.h>
-#include <sinfg/surface.h>
+#include <synfig/importer.h>
+#include <synfig/string.h>
+#include <synfig/surface.h>
 #include <png.h>
 
 /* === M A C R O S ========================================================= */
@@ -36,17 +40,20 @@
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-class png_mptr : public sinfg::Importer
+class png_mptr : public synfig::Importer
 {
-       SINFG_IMPORTER_MODULE_EXT
+       SYNFIG_IMPORTER_MODULE_EXT
 private:
-       sinfg::String filename;
-       sinfg::Surface surface_buffer;
+       synfig::String filename;
+       synfig::Surface surface_buffer;
 
        png_structp png_ptr;
     png_infop info_ptr;
     png_infop end_info;
 
+       bool trim;
+       unsigned int orig_width, orig_height, trimmed_x, trimmed_y;
+
        static void png_out_error(png_struct *png_data,const char *msg);
        static void png_out_warning(png_struct *png_data,const char *msg);
        static int read_chunk_callback(png_struct *png_data, png_unknown_chunkp chunk);
@@ -55,7 +62,10 @@ public:
        png_mptr(const char *filename);
        ~png_mptr();
 
-       virtual bool get_frame(sinfg::Surface &,sinfg::Time, sinfg::ProgressCallback *);
+       virtual bool get_frame(synfig::Surface &surface,synfig::Time time, synfig::ProgressCallback *callback);
+       virtual bool get_frame(synfig::Surface &surface,synfig::Time time,
+                                                  bool &trimmed, unsigned int &width, unsigned int &height, unsigned int &top, unsigned int &left,
+                                                  synfig::ProgressCallback *callback);
 };
 
 /* === E N D =============================================================== */