X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Feffects%2Fcolorcurve.cpp;h=d35b7928e52c5ff7212a8869d3a01802cbf5667a;hb=7f81f26889b84542b0b35685b0e80383256cdc47;hp=9e242d1984007c2c5ea8565f3533630f323f8065;hpb=55e3f2d494d939280a4ea48676fd17ca2342b457;p=libs%2Fgl.git

diff --git a/source/effects/colorcurve.cpp b/source/effects/colorcurve.cpp
index 9e242d19..d35b7928 100644
--- a/source/effects/colorcurve.cpp
+++ b/source/effects/colorcurve.cpp
@@ -12,11 +12,11 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-ColorCurve::ColorCurve(Resources &resources):
-	shprog(resources.get<Program>("_colorcurve.glsl.shader")),
-	quad(resources.get<Mesh>("_fullscreen_quad.mesh")),
-	linear_sampler(resources.get<Sampler>("_linear_clamp.samp")),
-	nearest_sampler(resources.get<Sampler>("_nearest_clamp.samp"))
+ColorCurve::ColorCurve():
+	shprog(Resources::get_global().get<Program>("_colorcurve.glsl.shader")),
+	quad(Resources::get_global().get<Mesh>("_fullscreen_quad.mesh")),
+	linear_sampler(Resources::get_global().get<Sampler>("_linear_clamp.samp")),
+	nearest_sampler(Resources::get_global().get<Sampler>("_nearest_clamp.samp"))
 {
 	curve.storage(LUMINANCE8, 256, 1);
 
@@ -84,9 +84,9 @@ ColorCurve::Template::Template():
 	srgb(false)
 { }
 
-ColorCurve *ColorCurve::Template::create(Resources &res, unsigned, unsigned) const
+ColorCurve *ColorCurve::Template::create(unsigned, unsigned) const
 {
-	RefPtr<ColorCurve> colorcurve = new ColorCurve(res);
+	RefPtr<ColorCurve> colorcurve = new ColorCurve();
 	colorcurve->set_exposure_adjust(exposure_adjust);
 	colorcurve->set_brightness_response(brightness_response);
 	if(srgb)