Merge branch 'genete_static_values'

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

diff --git a/synfig-core/src/synfig/importer.h b/synfig-core/src/synfig/importer.h
index ce89da5..7244f2c 100644 (file)
--- a/synfig-core/src/synfig/importer.h
+++ b/synfig-core/src/synfig/importer.h
@@ -33,12 +33,15 @@
 #include "string.h"
 #include "time.h"
 #include "gamma.h"
+#include "renddesc.h" 
 
 /* === M A C R O S ========================================================= */
 
 //! Defines various variables and the create method, common for all importers.
 //! To be used in the private part of the importer class definition.
-#define SYNFIG_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 SYNFIG_IMPORTER_SET_NAME(class,x) const char class::name__[]=x
@@ -122,8 +125,8 @@ public:
        **      \return \c true on success, \c false on error
        **      \see ProgressCallback, Surface
        */
-       virtual bool get_frame(Surface &surface,Time time, ProgressCallback *callback=NULL)=0;
-       virtual bool get_frame(Surface &surface,Time time,
+       virtual bool get_frame(Surface &surface, const RendDesc &renddesc, Time time, ProgressCallback *callback=NULL)=0;
+       virtual bool get_frame(Surface &surface, const RendDesc &renddesc,Time time,
                                                   bool &trimmed __attribute__ ((unused)),
                                                   unsigned int &width __attribute__ ((unused)),
                                                   unsigned int &height __attribute__ ((unused)),
@@ -131,7 +134,7 @@ public:
                                                   unsigned int &left __attribute__ ((unused)),
                                                   ProgressCallback *callback=NULL)
        {
-               return get_frame(surface,time,callback);
+               return get_frame(surface,renddesc,time,callback);
        }
 
        //! Returns \c true if the importer pays attention to the \a time parameter of get_frame()