Author: Carlos Lopez <[email protected]>
Date: Wed Jul 11 20:32:57 2012 +0200
Fix the gamma output on cairo_png target.
---
synfig-core/src/modules/mod_png/trgt_cairo_png.cpp | 24 ++++++++++++++++++++
synfig-core/src/modules/mod_png/trgt_cairo_png.h | 1 +
2 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/synfig-core/src/modules/mod_png/trgt_cairo_png.cpp
b/synfig-core/src/modules/mod_png/trgt_cairo_png.cpp
index bca24ff..0c4c062 100644
--- a/synfig-core/src/modules/mod_png/trgt_cairo_png.cpp
+++ b/synfig-core/src/modules/mod_png/trgt_cairo_png.cpp
@@ -111,6 +111,7 @@ cairo_png_trgt::obtain_surface(cairo_surface_t *&surface)
bool
cairo_png_trgt::put_surface(cairo_surface_t *surface, synfig::ProgressCallback
*cb)
{
+ gamma_filter(surface);
if(cairo_surface_status(surface))
{
if(cb) cb->error(_("Cairo Surface bad status"));
@@ -123,3 +124,26 @@ cairo_png_trgt::put_surface(cairo_surface_t *surface,
synfig::ProgressCallback *
cairo_surface_destroy(surface);
return true;
}
+
+void
+cairo_png_trgt::gamma_filter(cairo_surface_t *surface)
+{
+ CairoSurface temp(surface);
+ temp.map_cairo_image();
+ int x, y, w, h;
+ float range(CairoColor::range);
+ w=temp.get_w();
+ h=temp.get_h();
+ for(y=0;y<h; y++)
+ for(x=0;x<w; x++)
+ {
+ CairoColor c(temp[y][x]);
+ c=c.demult_alpha();
+ c.set_r(gamma_in(c.get_r()/range)*range);
+ c.set_g(gamma_in(c.get_g()/range)*range);
+ c.set_b(gamma_in(c.get_b()/range)*range);
+ c=c.premult_alpha();
+ temp[y][x]=c;
+ }
+ temp.unmap_cairo_image();
+}
diff --git a/synfig-core/src/modules/mod_png/trgt_cairo_png.h
b/synfig-core/src/modules/mod_png/trgt_cairo_png.h
index c0648c0..7df4b6c 100644
--- a/synfig-core/src/modules/mod_png/trgt_cairo_png.h
+++ b/synfig-core/src/modules/mod_png/trgt_cairo_png.h
@@ -54,6 +54,7 @@ private:
synfig::String base_filename;
synfig::String sequence_separator;
+ void gamma_filter(cairo_surface_t* surface);
public:
cairo_png_trgt(const char *filename, const synfig::TargetParam& /*
params */);
virtual ~cairo_png_trgt();
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl