X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fimporter.h;h=7244f2c969c23f1a5ad6cdcedaf8f31f4b78495f;hb=d43ed398fd84b93b96eb91d91dafdf65c80537e6;hp=18c53a4d9e8684f05a6864d1f35a4755ac5b030b;hpb=52a41ca116b89d7393ffe3d21b4ee3845cbe4d1c;p=synfig.git

diff --git a/synfig-core/src/synfig/importer.h b/synfig-core/src/synfig/importer.h
index 18c53a4..7244f2c 100644
--- 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
@@ -80,6 +83,8 @@ class ProgressCallback;
 class Importer : public etl::shared_object
 {
 public:
+	//! Type that represents a pointer to a Importer's constructor.
+	//! As a pointer to the constructor, it represents a "factory" of importers.
 	typedef Importer* (*Factory)(const char *filename);
 	typedef std::map<String,Factory> Book;
 	static Book* book_;
@@ -98,7 +103,7 @@ public:
 	typedef etl::handle<const Importer> ConstHandle;
 
 private:
-	//! Gamm of the imoporter.
+	//! Gamma of the importer.
 	//! \todo Do not hardcode the gamma to 2.2
 	Gamma gamma_;
 
@@ -120,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)),
@@ -129,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()