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 40a5717..4391c4e 100644 (file)
--- a/synfig-core/trunk/src/synfig/importer.h
+++ b/synfig-core/trunk/src/synfig/importer.h
@@ -1,28 +1,30 @@
-/* === S I N F G =========================================================== */
+#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
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_IMPORTER_H
-#define __SINFG_IMPORTER_H
+#ifndef __SYNFIG_IMPORTER_H
+#define __SYNFIG_IMPORTER_H
 
 /* === H E A D E R S ======================================================= */
 
@@ -39,28 +41,28 @@
 /* === M A C R O S ========================================================= */
 
 //! \writeme
-#define SINFG_IMPORTER_MODULE_EXT public: static const char name__[], version__[], ext__[],cvs_id__[]; static Importer *create(const char *filename);
+#define SYNFIG_IMPORTER_MODULE_EXT public: static const char name__[], version__[], ext__[],cvs_id__[]; static Importer *create(const char *filename);
 
 //! Sets the name of the importer
-#define SINFG_IMPORTER_SET_NAME(class,x) const char class::name__[]=x
+#define SYNFIG_IMPORTER_SET_NAME(class,x) const char class::name__[]=x
 
 //! \writeme
-#define SINFG_IMPORTER_SET_EXT(class,x) const char class::ext__[]=x
+#define SYNFIG_IMPORTER_SET_EXT(class,x) const char class::ext__[]=x
 
 //! Sets the version of the importer
-#define SINFG_IMPORTER_SET_VERSION(class,x) const char class::version__[]=x
+#define SYNFIG_IMPORTER_SET_VERSION(class,x) const char class::version__[]=x
 
 //! Sets the CVS ID of the importer
-#define SINFG_IMPORTER_SET_CVS_ID(class,x) const char class::cvs_id__[]=x
+#define SYNFIG_IMPORTER_SET_CVS_ID(class,x) const char class::cvs_id__[]=x
 
 //! \writeme
-#define SINFG_IMPORTER_INIT(class) sinfg::Importer* class::create(const char *filename) { return new class(filename); }
+#define SYNFIG_IMPORTER_INIT(class) synfig::Importer* class::create(const char *filename) { return new class(filename); }
 
 /* === T Y P E D E F S ===================================================== */
 
 /* === C L A S S E S & S T R U C T S ======================================= */
 
-namespace sinfg {
+namespace synfig {
 
 class Surface;
 class ProgressCallback;
@@ -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; }
@@ -115,7 +124,7 @@ public:
        static Handle open(const String &filename);
 };
 
-}; // END of namespace sinfg
+}; // END of namespace synfig
 
 /* === E N D =============================================================== */