assignment_6: maked more readable blur, and divided into small functions read_bmp_file function, got rid of bmp_header in the arguments of the new_header function

Author: MansurovB-source

assignment-6-image_rotation/Makefile

@@ -8,6 +8,9 @@ all:
 clean:
 	rm -f main *.o
 
+start:
+	./main -m bmp -t b -a 290
+
 # CC=gcc
 # CFLAGS=-Wall -Wextra -Wpedantic
 # LDFLAGS=

assignment-6-image_rotation/bmp.c

@@ -7,13 +7,20 @@
 
 static enum read_status read_header(FILE* file, struct bmp_header* header);
 static struct image read_image(FILE* file, uint32_t height, uint32_t width);
-static struct bmp_header new_header(const struct bmp_header* o_header, uint32_t height, uint32_t width);
-static void save_bmp(FILE* file, const struct bmp_header* header, const struct image img);
+static struct bmp_header new_header(uint32_t height, uint32_t width);
+static void save_bmp(FILE* file, const struct image img);
 static struct image select_mode(struct image image, char mode, double angle);
+static struct image read(const char* r_file);
+static void write(const char* w_file, const struct image img, char transform, double angle);
 
 enum open_status open_file(FILE** file, const char* filename, const char* mod);
 
-void read_bmp_file(const char* r_file, const char* w_file, char transform, double angle) {
+void start(const char* r_file, const char* w_file, char transform, double angle) {
+	struct image img =  read(r_file);
+	write(w_file, img, transform, angle);
+}
+
+struct image read(const char* r_file) {
 	FILE* file;
 	if(open_file(&file, r_file, "rb") != OPEN_OK) {
 		puts("Something wrong with read file");
@@ -24,19 +31,21 @@ void read_bmp_file(const char* r_file, const char* w_file, char transform, doubl
 		puts("Invalid header");
 		exit(READ_INVALID_HEADER);
 	}
-
 	fseek(file, header.bOffBits, SEEK_SET);
-	
 	struct image image = read_image(file, header.biHeight, header.biWidth);
 	fclose(file);
+	return image;
+}
+
+void write(const char* w_file, const struct image img, char transform, double angle) {
+	FILE* file;
 
 	if(open_file(&file, w_file, "wb") != OPEN_OK) {
 		puts("Somethign wrong with write file");
 		exit(OPEN_ERR);
 	}
-	image = select_mode(image, transform, angle);
-	header = new_header(&header, image.height, image.width);
-	save_bmp(file, &header, image);
+	struct image image = select_mode(img, transform, angle);
+	save_bmp(file, image);
 	fclose(file);
 }
 
@@ -77,7 +86,7 @@ enum read_status read_header(FILE* file, struct bmp_header* header) {
 	return img;
 }
 
-struct bmp_header new_header(const struct bmp_header* o_header, uint32_t height, uint32_t width) {
+struct bmp_header new_header(uint32_t height, uint32_t width) {
 	uint8_t padding = set_padding(width);
 	struct bmp_header new_header = {
 		BM, 
@@ -99,9 +108,10 @@ struct bmp_header new_header(const struct bmp_header* o_header, uint32_t height,
 	return new_header;
 }
 
-void save_bmp(FILE* file, const struct bmp_header* header, const struct image img) {	
-	uint8_t padding = set_padding(header -> biWidth);
-	fwrite(header, sizeof(struct bmp_header), 1, file);
+void save_bmp(FILE* file, const struct image img) {	
+	uint8_t padding = set_padding(img.width);
+	struct bmp_header header = new_header(img.height, img.width);
+	fwrite(&header, sizeof(struct bmp_header), 1, file);
 	for(uint32_t i = 0; i < img.height; i++) {
 		fwrite(img.data + i * img.width, sizeof(struct pixel), img.width, file);
 		fwrite(&padding, 1, padding, file);	

assignment-6-image_rotation/bmp_struct.h

@@ -43,6 +43,7 @@ enum open_status {
 	OPEN_ERR
 };
 
-void read_bmp_file(const char* r_file, const char* w_file, char transform, double angle);
+
+void start(const char* r_file, const char* w_file, char transform, double angle);
 
 #endif

assignment-6-image_rotation/main

@@ -11,6 +11,7 @@ int main(int argc, char** argv) {
 	char trans = 'a';
 	char* mode;
 	int angle = 45;
+	puts("-----start-----");
 	while((rez = getopt(argc, argv, "m:t:a:")) != -1) {
 		switch(rez) {
 			case 'm': 
@@ -30,7 +31,6 @@ int main(int argc, char** argv) {
 				break;
 		}
 	}
-	puts("-----start-----");
 	transform("./res/p.bmp", "./res/p1.bmp", mode, trans, (double) angle);
 	puts("-----end-----");
 	return 0;

assignment-6-image_rotation/main.c

@@ -4,7 +4,7 @@
 
 void transform(const char* r_file, const char* w_file, char* mode, char transform, double angle) {
 	if(strcmp(mode, "bmp") == 0) {
-		read_bmp_file(r_file, w_file, transform, angle);
+		start(r_file, w_file, transform, angle);
 	} else {
 		puts("We don't have any other type");
 	}

assignment-6-image_rotation/read_file.c

@@ -4,6 +4,7 @@
 
 static uint32_t calc_new_height(const struct image* source, double angle);
 static uint32_t calc_new_width(const struct image* source, double angle);
+static void pixel_blur(struct pixel* const new_pixel, const struct pixel* source, int32_t width)
 
 struct image rotate_left(const struct image* source) {
 	struct image new_image = create_image(source -> height, source -> width);
@@ -25,7 +26,7 @@ struct image mirror_image(const struct image* source) {
  		}
  	}
 
- 	if(new_image.width / 2 != 0) {
+ 	if(new_image.width % 2 != 0) {
  		for(uint32_t i = 0; i < new_image.height; i++) {
  			*(new_image.data + (i * new_image.width) + new_image.width + 1) = 
  			*(source -> data + (i * new_image.width) + new_image.width + 1);
@@ -34,32 +35,31 @@ struct image mirror_image(const struct image* source) {
  	return new_image;
 }
 
+void pixel_blur(struct pixel* const new_pixel, const struct pixel* source, int32_t width) {
+	uint16_t b = 0;
+ 	uint16_t g = 0;
+ 	uint16_t r = 0;
+
+	for(int32_t i = -1; i < 2; i++) {
+ 		for (int32_t j = -1; j < 2; j++) {
+ 			b += (source + (i * width) + j) -> b;
+ 			g += (source + (i * width) + j) -> g;
+ 			r += (source + (i * width) + j) -> r;
+		}
+ 	}
+
+ 			new_pixel -> b = b / 9;
+ 			new_pixel -> g = g / 9;
+ 			new_pixel -> r = r / 9;
+}
 
 struct image blur(const struct image* source) {
 	struct image new_image = create_image(source -> height, source -> width);
- 	uint16_t b = 0;
- 	uint16_t g = 0;
- 	uint16_t r = 0;
 
  	// the inner part
  	for(uint32_t i = 1; i < new_image.height - 1; i++) {
  		for(uint32_t j = 1; j < new_image.width - 1; j++) {
- 			
- 			for(int32_t s_i = -1; s_i < 2; s_i++) {
- 				for (int32_t s_j = -1; s_j < 2; s_j++) {
- 					b += (source -> data + ((i + s_i) * new_image.width) + (j + s_j)) -> b;
- 					g += (source -> data + ((i + s_i) * new_image.width) + (j + s_j)) -> g;
- 					r += (source -> data + ((i + s_i) * new_image.width) + (j + s_j)) -> r;
- 				}
- 			}
-
- 			(new_image.data + (i * new_image.width) + j) -> b = b / 9;
- 			(new_image.data + (i * new_image.width) + j) -> g = g / 9;
- 			(new_image.data + (i * new_image.width) + j) -> r = r / 9;
-
- 			b = 0;
- 			g = 0;
- 			r = 0;
+ 			pixel_blur((struct pixel*)(new_image.data + (i * new_image.width) + j), (struct pixel*)(source -> data + (i * new_image.width) + j), source -> width);
  		}
  	}