Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-core / trunk / src / synfig / importer.h

diff --git a/synfig-core/trunk/src/synfig/importer.h b/synfig-core/trunk/src/synfig/importer.h
index b084dac..4391c4e 100644 (file)
--- a/synfig-core/trunk/src/synfig/importer.h
+++ b/synfig-core/trunk/src/synfig/importer.h
@@ -1,20 +1,22 @@
+#include <cstdio>
 /* === S Y N F I G ========================================================= */
 /*!    \file importer.h
 **     \brief writeme
 **
-**     $Id: importer.h,v 1.1.1.1 2005/01/04 01:23:14 darco Exp $
+**     $Id$
 **
 **     \legal
-**     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.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -75,9 +77,9 @@ public:
        typedef Importer* (*Factory)(const char *filename);
        typedef std::map<String,Factory> Book;
        static Book* book_;
-       
+
        static Book& book();
-       
+
        static bool subsys_init();
        static bool subsys_stop();
 
@@ -95,7 +97,7 @@ public:
 
        Gamma& gamma() { return gamma_; }
        const Gamma& gamma()const { return gamma_; }
-       
+
        virtual ~Importer();
 
        //! Gets a frame and puts it into \a surface
@@ -107,6 +109,13 @@ public:
        **      \see ProgressCallback, Surface
        */
        virtual bool get_frame(Surface &surface,Time time, ProgressCallback *callback=NULL)=0;
+       virtual bool get_frame(Surface &surface,Time time,
+                                                  bool &trimmed __attribute__ ((unused)),
+                                                  unsigned int &width __attribute__ ((unused)), unsigned int &height __attribute__ ((unused)),
+                                                  unsigned int &top __attribute__ ((unused)), unsigned int &left __attribute__ ((unused)),
+                                                  ProgressCallback *callback=NULL) {
+               return get_frame(surface,time,callback);
+       }
 
        //! Returns \c true if the importer pays attention to the \a time parameter of get_frame()
        virtual bool is_animated() { return false; }