Made function for the sobel algorithm

Author: petermlm

Makefile

@@ -7,8 +7,9 @@ check:
 
 run:
 	convert imgs/img.png imgs/img.rgb
-	./src/sobel imgs/img.rgb imgs/img_out.gray -i imgs/img_out_h.gray imgs/img_out_v.gray
+	./src/sobel imgs/img.rgb imgs/img_out.gray -g imgs/img_out_gray.gray -i imgs/img_out_h.gray imgs/img_out_v.gray
 	convert -size 512x512 -depth 8 imgs/img_out.gray imgs/img_out.png
+	convert -size 512x512 -depth 8 imgs/img_out_gray.gray imgs/img_out_gray.png
 	convert -size 512x512 -depth 8 imgs/img_out_h.gray imgs/img_out_h.png
 	convert -size 512x512 -depth 8 imgs/img_out_v.gray imgs/img_out_v.png
 

src/main.c

@@ -6,14 +6,20 @@
 #include "file_operations.h"
 
 int main(int argc, char *argv[]) {
-    char *file_in, *file_out, *file_out_h, *file_out_v, *file_gray;
-    int inter_files = 0, gray_file = 0;
-    byte *rgb, *gray;
-    int rgb_size, gray_size;
-    int sobel_h[] = {1, 0, -1, 2, 0, -2, 1, 0, -1},
-        sobel_v[] = {1, 2, 1, 0, 0, 0, -1, -2, -1};
-    byte *sobel_h_res, *sobel_v_res;
-    byte *contour_img;
+    char *file_in,
+         *file_out,
+         *file_out_h,
+         *file_out_v,
+         *file_gray;
+
+    byte *rgb,
+         *gray,
+         *sobel_h_res,
+         *sobel_v_res,
+         *contour_img;
+
+    int inter_files = 0,
+        gray_file = 0;
 
     // Get arguments
     if(argc < 3) {
@@ -61,29 +67,21 @@ int main(int argc, char *argv[]) {
     }
 
     // Read file to rgb and get size
-    rgb_size = readFile(file_in, &rgb);
+    int rgb_size = readFile(file_in, &rgb);
 
-    // Get gray representation of the image
-    gray_size = rgbToGray(rgb, &gray, rgb_size);
+    int gray_size = sobelFilter(rgb, &gray, &sobel_h_res, &sobel_v_res, &contour_img, rgb_size);
 
     // Write gray image
     if(gray_file) {
         writeFile(file_gray, gray, gray_size);
     }
 
-    // Make sobel operations
-    itConv(gray, gray_size, sobel_h, &sobel_h_res);
-    itConv(gray, gray_size, sobel_v, &sobel_v_res);
-
     // Write image after each sobel operator
     if(inter_files) {
         writeFile(file_out_h, sobel_h_res, gray_size);
         writeFile(file_out_v, sobel_v_res, gray_size);
     }
 
-    // Calculate contour matrix
-    contour(sobel_h_res, sobel_v_res, gray_size, &contour_img);
-
     // Write sobel img to a file
     writeFile(file_out, contour_img, gray_size);
 

src/sobel.c

@@ -107,4 +107,20 @@ void contour(byte *sobel_h, byte *sobel_v, int gray_size, byte **contour_img) {
     }
 }
 
+int sobelFilter(byte *rgb, byte **gray, byte **sobel_h_res, byte **sobel_v_res, byte **contour_img, int rgb_size) {
+    int sobel_h[] = {1, 0, -1, 2, 0, -2, 1, 0, -1},
+        sobel_v[] = {1, 2, 1, 0, 0, 0, -1, -2, -1};
+
+    // Get gray representation of the image
+    int gray_size = rgbToGray(rgb, gray, rgb_size);
+
+    // Make sobel operations
+    itConv(*gray, gray_size, sobel_h, sobel_h_res);
+    itConv(*gray, gray_size, sobel_v, sobel_v_res);
+
+    // Calculate contour matrix
+    contour(*sobel_h_res, *sobel_v_res, gray_size, contour_img);
+
+    return gray_size;
+}
 

src/sobel.h

@@ -8,6 +8,7 @@ void makeOpMem(byte *buffer, int buffer_size, int cindex, byte *op_mem);
 int convolution(byte *X, int *Y, int c_size);
 void itConv(byte *buffer, int buffer_size, int *op, byte **res);
 void contour(byte *sobel_h, byte *sobel_v, int gray_size, byte **contour_img);
+int sobelFilter(byte *rgb, byte **gray, byte **sobel_h_res, byte **sobel_v_res, byte **contour_img, int rgb_size);
 
 #endif