X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Ftarget.cpp;fp=synfig-core%2Fsrc%2Fsynfig%2Ftarget.cpp;h=47727be09c1c8ec7a1e6ad1e1edc2036cc488730;hb=8289faf633081201ed763127316009f4a74e700c;hp=92153b47fe9864f645f90995ec5dc7356dd240b2;hpb=5dcab4f32891574b830e5919a71e72b80a506641;p=synfig.git diff --git a/synfig-core/src/synfig/target.cpp b/synfig-core/src/synfig/target.cpp index 92153b4..47727be 100644 --- a/synfig-core/src/synfig/target.cpp +++ b/synfig-core/src/synfig/target.cpp @@ -55,9 +55,14 @@ Target::subsys_init() //default_gamma_->set_black_level(0.05); // Default to 5% black level. // At least one target must be available. - book()["null"]=std::pair(Target_Null::create,"null"); + book()["null"].factory = + reinterpret_cast(&Target_Null::create); + book()["null"].filename = "null"; ext_book()["null"]="null"; - book()["null-tile"]=std::pair(Target_Null_Tile::create,"null-tile"); + + book()["null-tile"].factory = + reinterpret_cast(&Target_Null_Tile::create); + book()["null-tile"].filename = "null-tile"; ext_book()["null-tile"]="null-tile"; return true; @@ -110,5 +115,5 @@ Target::create(const String &name, const String &filename) if(!book().count(name)) return handle(); - return Target::Handle(book()[name].first(filename.c_str())); + return Target::Handle(book()[name].factory(filename.c_str())); }