Fix crash for Magick++, Gif and other targets utilizing init() function

synfig · Oct 25, 2014 · 0be870b · 0be870b
1 parent f42ead3
commit 0be870b
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/synfig-core/src/modules/mod_dv/trgt_dv.cpp b/synfig-core/src/modules/mod_dv/trgt_dv.cpp
@@ -143,7 +143,7 @@ dv_trgt::set_rend_desc(RendDesc *given_desc)
 }
 
 bool
-dv_trgt::init()
+dv_trgt::init(synfig::ProgressCallback *cb)
 {
 	imagecount=desc.get_frame_start();
 

diff --git a/synfig-core/src/modules/mod_dv/trgt_dv.h b/synfig-core/src/modules/mod_dv/trgt_dv.h
@@ -59,7 +59,7 @@ class dv_trgt : public synfig::Target_Scanline
 
 
 	virtual bool set_rend_desc(synfig::RendDesc *desc);
-	virtual bool init();
+	virtual bool init(synfig::ProgressCallback *cb);
 	virtual bool start_frame(synfig::ProgressCallback *cb);
 	virtual void end_frame();
 

diff --git a/synfig-core/src/modules/mod_gif/trgt_gif.cpp b/synfig-core/src/modules/mod_gif/trgt_gif.cpp
@@ -96,7 +96,7 @@ gif::set_rend_desc(RendDesc *given_desc)
 }
 
 bool
-gif::init()
+gif::init(synfig::ProgressCallback *cb)
 {
 	int w=desc.get_w(),h=desc.get_h();
 

diff --git a/synfig-core/src/modules/mod_gif/trgt_gif.h b/synfig-core/src/modules/mod_gif/trgt_gif.h
@@ -198,7 +198,7 @@ class gif : public synfig::Target_Scanline
 	gif(const char *filename, const synfig::TargetParam& /* params */);
 
 	virtual bool set_rend_desc(synfig::RendDesc *desc);
-	virtual bool init();
+	virtual bool init(synfig::ProgressCallback *cb);
 	virtual bool start_frame(synfig::ProgressCallback *cb);
 	virtual void end_frame();
 

diff --git a/synfig-core/src/modules/mod_imagemagick/trgt_imagemagick.cpp b/synfig-core/src/modules/mod_imagemagick/trgt_imagemagick.cpp
@@ -119,7 +119,7 @@ imagemagick_trgt::set_rend_desc(RendDesc *given_desc)
 }
 
 bool
-imagemagick_trgt::init()
+imagemagick_trgt::init(synfig::ProgressCallback *cb)
 {
 	imagecount=desc.get_frame_start();
 	if(desc.get_frame_end()-desc.get_frame_start()>0)

diff --git a/synfig-core/src/modules/mod_imagemagick/trgt_imagemagick.h b/synfig-core/src/modules/mod_imagemagick/trgt_imagemagick.h
@@ -61,7 +61,7 @@ class imagemagick_trgt : public synfig::Target_Scanline
 	virtual ~imagemagick_trgt();
 
 	virtual bool set_rend_desc(synfig::RendDesc *desc);
-	virtual bool init();
+	virtual bool init(synfig::ProgressCallback *cb);
 	virtual bool start_frame(synfig::ProgressCallback *cb);
 	virtual void end_frame();
 	virtual synfig::Color * start_scanline(int scanline);

diff --git a/synfig-core/src/modules/mod_libavcodec/trgt_av.cpp b/synfig-core/src/modules/mod_libavcodec/trgt_av.cpp
@@ -969,7 +969,7 @@ Target_LibAVCodec::end_scanline()
 	return true;
 }
 
-bool Target_LibAVCodec::init()
+bool Target_LibAVCodec::init(synfig::ProgressCallback *cb)
 {
 	//hardcoded test for mpeg
 	if(!data->Initialize(filename.c_str(),NULL))

diff --git a/synfig-core/src/modules/mod_libavcodec/trgt_av.h b/synfig-core/src/modules/mod_libavcodec/trgt_av.h
@@ -57,7 +57,7 @@ class Target_LibAVCodec : public synfig::Target_Scanline
 					  const synfig::TargetParam& /* params */);
 	virtual ~Target_LibAVCodec();
 
-	virtual bool init();
+	virtual bool init(synfig::ProgressCallback *cb);
 
 	virtual bool set_rend_desc(synfig::RendDesc *desc);
 	virtual bool start_frame(synfig::ProgressCallback *cb);

diff --git a/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp b/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp
@@ -211,7 +211,7 @@ magickpp_trgt::set_rend_desc(RendDesc *given_desc)
 }
 
 bool
-magickpp_trgt::init()
+magickpp_trgt::init(synfig::ProgressCallback *cb)
 {
 	width = desc.get_w();
 	height = desc.get_h();

diff --git a/synfig-core/src/modules/mod_magickpp/trgt_magickpp.h b/synfig-core/src/modules/mod_magickpp/trgt_magickpp.h
@@ -62,7 +62,7 @@ class magickpp_trgt : public synfig::Target_Scanline
 	virtual ~magickpp_trgt();
 
 	virtual bool set_rend_desc(synfig::RendDesc *desc);
-	virtual bool init();
+	virtual bool init(synfig::ProgressCallback *cb);
 
 	virtual bool start_frame(synfig::ProgressCallback *cb);
 	virtual void end_frame();

diff --git a/synfig-core/src/modules/mod_mng/trgt_mng.cpp b/synfig-core/src/modules/mod_mng/trgt_mng.cpp
@@ -148,7 +148,7 @@ mng_trgt::set_rend_desc(RendDesc *given_desc)
 
 
 bool
-mng_trgt::init()
+mng_trgt::init(synfig::ProgressCallback *cb)
 {
 	// synfig::info("%s:%d mng_trgt::init()", __FILE__, __LINE__);
 

diff --git a/synfig-core/src/modules/mod_mng/trgt_mng.h b/synfig-core/src/modules/mod_mng/trgt_mng.h
@@ -87,7 +87,7 @@ class mng_trgt : public synfig::Target_Scanline
 	virtual ~mng_trgt();
 
 	virtual bool set_rend_desc(synfig::RendDesc *desc);
-	virtual bool init();
+	virtual bool init(synfig::ProgressCallback *cb);
 	virtual bool start_frame(synfig::ProgressCallback *cb);
 	virtual void end_frame();
 

diff --git a/synfig-core/src/modules/mod_yuv420p/trgt_yuv.cpp b/synfig-core/src/modules/mod_yuv420p/trgt_yuv.cpp
@@ -75,7 +75,7 @@ yuv::~yuv()
 }
 
 bool
-yuv::init()
+yuv::init(synfig::ProgressCallback *cb)
 {
 	if (!file)
 		return false;

diff --git a/synfig-core/src/modules/mod_yuv420p/trgt_yuv.h b/synfig-core/src/modules/mod_yuv420p/trgt_yuv.h
@@ -58,7 +58,7 @@ class yuv : public synfig::Target_Scanline
 	yuv(const char *filename, const synfig::TargetParam& /* params */);
 	virtual ~yuv();
 
-	virtual bool init();
+	virtual bool init(synfig::ProgressCallback *cb);
 	virtual bool set_rend_desc(synfig::RendDesc *desc);
 	virtual bool start_frame(synfig::ProgressCallback *cb);
 	virtual void end_frame();