Fix sobel implementation.

die-net · Aug 1, 2018 · 44448b2 · 44448b2
1 parent 34c6f6a
commit 44448b2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/cmd/fotomat/version.go b/cmd/fotomat/version.go
@@ -2,5 +2,5 @@ package main
 
 const (
 	// FotomatVersion is updated by git-hooks/pre-commit
-	FotomatVersion = "2.8.241"
+	FotomatVersion = "2.8.242"
 )
diff --git a/vips/convolution.h b/vips/convolution.h
@@ -59,18 +59,26 @@ cgo_sobel(VipsImage *in, VipsImage **out) {
 
     VipsImage *sx = NULL;
     VipsImage *sy = NULL;
+    VipsImage *ax = NULL;
+    VipsImage *ay = NULL;
     VipsImage *add = NULL;
 
     int ret = -1;
     if (!vips_conv(band, &sx, x, NULL)) {
-        if (!vips_conv(band, &sy, y, NULL)) {
+        if (!vips_abs(sx, &ax, NULL)) {
-            if (!vips_add(sx, sy, &add, NULL)) {
+            if (!vips_conv(band, &sy, y, NULL)) {
-                if (!vips_cast(add, out, VIPS_FORMAT_UCHAR, NULL)) {
+                if (!vips_abs(sy, &ay, NULL)) {
-                    ret = 0;
+                    if (!vips_add(ax, ay, &add, NULL)) {
+                        if (!vips_cast(add, out, VIPS_FORMAT_UCHAR, NULL)) {
+                            ret = 0;
+                        }
+                        g_object_unref(add);
+                    }
+                    g_object_unref(ay);
                 }
-                g_object_unref(add);
+                g_object_unref(sy);
             }
-            g_object_unref(sy);
+            g_object_unref(ax);
         }
         g_object_unref(sx);
     }