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 6dbe1ec..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,8 +1,10 @@
-/*! ========================================================================
-** Synfig
-** 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
 **
+**     $Id$
+**
+**     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
 **     This package is free software; you can redistribute it and/or
@@ -14,6 +16,7 @@
 **     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 ===========================================================
 **
@@ -48,6 +51,9 @@ private:
     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);
@@ -56,7 +62,10 @@ public:
        png_mptr(const char *filename);
        ~png_mptr();
 
-       virtual bool get_frame(synfig::Surface &,synfig::Time, synfig::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 =============================================================== */