pixbufutils 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ba2ec614619680bd44bf1e4c122ba3b8dc1c830
-  data.tar.gz: 41112646a90c2c68aa2f2f8da9750732e83130d5
+  metadata.gz: 21a112cea7c4b07cad4965b3826547d21e49d700
+  data.tar.gz: 5b7866be086861252f435f41533950bc3f468f7c
 SHA512:
-  metadata.gz: 524e1a045190ed226aa85f41e72051e509cc9dbc7d6d60004f0e6ff3c90cc7d204648eef0887a604c5e415a90e45e6172d5ff040b619dcc26a74047212d1cd66
-  data.tar.gz: dd0d72083538fd27eb43d72a391420b61bc3c3b00bc62a3181bd29b18f959e47f55c21a21e9a9de9401ec0fa45e71dd20dc29a07883f6548f930158b3fac7b86
+  metadata.gz: 818a614285c9296209c11404f86230ffe8ea19578e1434f4e288d96272f9c25114f17c1610e39af82ed762361fdba1f8e22ac099825475e70aade5936e41303f
+  data.tar.gz: 16c6272eb52737e78fc44a15337c369b45f7983cd26e6ba92090bc0bf653971ae233c29cf0bc3d5f5e767dd47a21b146e5e3914d4b4696abac1e7354697fe768

data/Rakefile

@@ -22,7 +22,7 @@ spec = Gem::Specification.new do |s|
 	s.name = "pixbufutils"
 	s.author = "Geoff Youngs"
 	s.email = "git@intersect-uk.co.uk"
-	s.version = "0.0.4"
+	s.version = "0.0.5"
 	s.homepage = "http://github.com/geoffyoungs/pixbufutils"
 	s.summary = "Additional utils for Gdk::Pixbuf"
 	s.add_dependency("rubber-generate", ">= 0.0.17")

data/ext/pixbufutils/filter.h

@@ -1,5 +1,14 @@
 #include <math.h>
 
+inline unsigned char pix_value(int value)
+{
+  if (value < 0)
+    return 0;
+  if (value > 255)
+    return 255;
+  return (unsigned char) value;
+}
+
 static GdkPixbuf *pixbuf_adjust_brightness(GdkPixbuf *src, GdkPixbuf *dest, int adjust) {
   int        s_has_alpha, d_has_alpha;
 	int        s_width, s_height, s_rowstride;
@@ -7,7 +16,7 @@ static GdkPixbuf *pixbuf_adjust_brightness(GdkPixbuf *src, GdkPixbuf *dest, int
 	guchar    *s_pix, *sp;
   guchar    *d_pix, *dp;
 	int        i, j, pix_width;
-  int        mod = (int) floor(255 * (adjust/100));
+  int        mod = (int) floor(255 * ((double)adjust/100.0));
 
 
 	g_return_val_if_fail(src != NULL, NULL);
@@ -39,9 +48,9 @@ static GdkPixbuf *pixbuf_adjust_brightness(GdkPixbuf *src, GdkPixbuf *dest, int
 
 		for (j = 0; j < s_width; j++) {
 
-      dp[0] = (unsigned char) MAX(MIN(mod + sp[0], 255), 0);
-      dp[1] = (unsigned char) MAX(MIN(mod + sp[1], 255), 0);
-      dp[2] = (unsigned char) MAX(MIN(mod + sp[2], 255), 0);
+      dp[0] = pix_value(mod + sp[0]);
+      dp[1] = pix_value(mod + sp[1]);
+      dp[2] = pix_value(mod + sp[2]);
 
 			if (s_has_alpha)
 			{
@@ -59,15 +68,6 @@ static GdkPixbuf *pixbuf_adjust_brightness(GdkPixbuf *src, GdkPixbuf *dest, int
 	return dest;
 }
 
-inline unsigned char pix_value(int value)
-{
-  if (value < 0)
-    return 0;
-  if (value > 255)
-    return 255;
-  return (unsigned char) value;
-}
-
 static GdkPixbuf *pixbuf_adjust_saturation(GdkPixbuf *src, GdkPixbuf *dest, int adjust) {
   int        s_has_alpha, d_has_alpha;
 	int        s_width, s_height, s_rowstride;
@@ -189,11 +189,11 @@ static GdkPixbuf *pixbuf_adjust_vibrance(GdkPixbuf *src, GdkPixbuf *dest, int ad
       mod = ((abs(max - avg) * 2/255) * -1 * adjust) / 100.0;
 
       if (max != sp[0])
-        dp[0] = (unsigned char) MAX(MIN(sp[0] + ( max - sp[0] ) * mod , 255), 0);
+        dp[0] = pix_value(sp[0] + ( max - sp[0] ) * mod);
       if (max != sp[1])
-        dp[1] = (unsigned char) MAX(MIN(sp[1] + ( max - sp[1] ) * mod , 255), 0);
+        dp[1] = pix_value(sp[1] + ( max - sp[1] ) * mod);
       if (max != sp[2])
-        dp[2] = (unsigned char) MAX(MIN(sp[2] + ( max - sp[2] ) * mod , 255), 0);
+        dp[2] = pix_value(sp[2] + ( max - sp[2] ) * mod);
 
 			if (s_has_alpha)
 			{
@@ -247,9 +247,9 @@ static GdkPixbuf *pixbuf_adjust_contrast(GdkPixbuf *src, GdkPixbuf *dest, int ad
 
 		for (j = 0; j < s_width; j++) {
 
-      dp[0] = (unsigned char) MAX(MIN(127 + ( (((double)sp[0]) - 127) * mod ), 255), 0);
-      dp[1] = (unsigned char) MAX(MIN(127 + ( (((double)sp[1]) - 127) * mod ), 255), 0);
-      dp[2] = (unsigned char) MAX(MIN(127 + ( (((double)sp[2]) - 127) * mod ), 255), 0);
+      dp[0] = pix_value(127 + ( (((double)sp[0]) - 127) * mod ));
+      dp[1] = pix_value(127 + ( (((double)sp[1]) - 127) * mod ));
+      dp[2] = pix_value(127 + ( (((double)sp[2]) - 127) * mod ));
 
 			if (s_has_alpha)
 			{
@@ -354,9 +354,9 @@ static GdkPixbuf *pixbuf_convolution_matrix(GdkPixbuf *src, GdkPixbuf *dest, int
       sum_green /= divisor;
       sum_blue  /= divisor;
 
-			dp[0] = (unsigned char)MIN(MAX(sum_red,   0.0), 255.0);	/* red */
-			dp[1] = (unsigned char)MIN(MAX(sum_green, 0.0), 255.0);	/* green */
-			dp[2] = (unsigned char)MIN(MAX(sum_blue,  0.0), 255.0);	/* blue */
+			dp[0] = pix_value(sum_red);	/* red */
+			dp[1] = pix_value(sum_green);	/* green */
+			dp[2] = pix_value(sum_blue);	/* blue */
 
 			if (s_has_alpha)
 			{

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pixbufutils
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Geoff Youngs