X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Ftarget.cpp;h=47727be09c1c8ec7a1e6ad1e1edc2036cc488730;hb=8289faf633081201ed763127316009f4a74e700c;hp=6a73822cb42ab776350170cb8d87be0157df9ed7;hpb=adfc80c126f482d7ea2bac38001a2c4a7c7df88c;p=synfig.git

diff --git a/synfig-core/src/synfig/target.cpp b/synfig-core/src/synfig/target.cpp
index 6a73822..47727be 100644
--- a/synfig-core/src/synfig/target.cpp
+++ b/synfig-core/src/synfig/target.cpp
@@ -54,9 +54,15 @@ Target::subsys_init()
 	default_gamma_=new synfig::Gamma(1.0/2.2);
 	//default_gamma_->set_black_level(0.05); // Default to 5% black level.
 
-	book()["null"]=std::pair<synfig::Target::Factory,String>(Target_Null::create,"null");
+	// At least one target must be available.
+	book()["null"].factory =
+		reinterpret_cast<synfig::Target::Factory>(&Target_Null::create);
+  book()["null"].filename = "null";
 	ext_book()["null"]="null";
-	book()["null-tile"]=std::pair<synfig::Target::Factory,String>(Target_Null_Tile::create,"null-tile");
+
+	book()["null-tile"].factory =
+    reinterpret_cast<synfig::Target::Factory>(&Target_Null_Tile::create);
+  book()["null-tile"].filename = "null-tile";
 	ext_book()["null-tile"]="null-tile";
 
 	return true;
@@ -109,5 +115,5 @@ Target::create(const String &name, const String &filename)
 	if(!book().count(name))
 		return handle<Target>();
 
-	return Target::Handle(book()[name].first(filename.c_str()));
+	return Target::Handle(book()[name].factory(filename.c_str()));
 }