Second commit

compress.c

@@ -7,58 +7,58 @@
 
 void cclt_compress(char* output_file, unsigned char* image_buffer)
 {
-  struct jpeg_compress_struct cinfo;
+	struct jpeg_compress_struct cinfo;
 
-  struct jpeg_error_mgr jerr;
-  FILE * outfile;               
-  JSAMPROW row_pointer[1];      /* pointer to JSAMPLE row[s] */
-  int row_stride;               /* physical row width in image buffer */
+	struct jpeg_error_mgr jerr;
+	FILE * outfile;
+	JSAMPROW row_pointer[1];
+	int row_stride;
 
-  if ((outfile = fopen(output_file, "wb")) == NULL) {
-    fprintf(stderr, "can't open %s\n", output_file);
-    exit(1);
-  }
+	if ((outfile = fopen(output_file, "wb")) == NULL) {
+	fprintf(stderr, "can't open %s\n", output_file);
+	exit(1);
+	}
 
-  cinfo.err = jpeg_std_error(&jerr);
+	cinfo.err = jpeg_std_error(&jerr);
 
-  jpeg_create_compress(&cinfo);
-  jpeg_stdio_dest(&cinfo, outfile);
+	jpeg_create_compress(&cinfo);
+	jpeg_stdio_dest(&cinfo, outfile);
 
-  cinfo.image_width = 80;
-  cinfo.image_height = 80;
-  cinfo.input_components = 3;
-  cinfo.in_color_space = JCS_RGB;
+	cinfo.image_width = 80;
+	cinfo.image_height = 80;
+	cinfo.input_components = 3;
+	cinfo.in_color_space = JCS_RGB;
 
-  jpeg_set_defaults(&cinfo);
+	jpeg_set_defaults(&cinfo);
 
-  cinfo.dct_method = JDCT_FLOAT;
-  cinfo.optimize_coding = TRUE;
-  cinfo.smoothing_factor = 50;
-  jpeg_set_quality(&cinfo, 80, TRUE );
-  jpeg_set_colorspace(&cinfo, JCS_RGB);
+	cinfo.dct_method = JDCT_FLOAT;
+	cinfo.optimize_coding = TRUE;
+	cinfo.smoothing_factor = 50;
+	jpeg_set_quality(&cinfo, 80, TRUE );
+	jpeg_set_colorspace(&cinfo, JCS_RGB);
 
-  
 
-  jpeg_start_compress(&cinfo, TRUE);
+
+	jpeg_start_compress(&cinfo, TRUE);
 
 	//TODO cambia
-  row_stride = 80 * 3;//image_width * 3;
+	row_stride = 80 * 3;//image_width * 3;
 
 
-  while (cinfo.next_scanline < cinfo.image_height) {
-  
-  	printf("%d%\r", cinfo.next_scanline * 100 / cinfo.image_height);
+	while (cinfo.next_scanline < cinfo.image_height) {
 
-    row_pointer[0] = &image_buffer[cinfo.next_scanline * row_stride];
-    (void) jpeg_write_scanlines(&cinfo, row_pointer, 1);
-  }
-  printf("%d%\n", cinfo.next_scanline * 100 / cinfo.image_height);
+	printf("%d%\r", cinfo.next_scanline * 100 / cinfo.image_height);
+
+	row_pointer[0] = &image_buffer[cinfo.next_scanline * row_stride];
+	(void) jpeg_write_scanlines(&cinfo, row_pointer, 1);
+	}
+	printf("%d%\n", cinfo.next_scanline * 100 / cinfo.image_height);
 
 
-  jpeg_finish_compress(&cinfo);
-  fclose(outfile);
+	jpeg_finish_compress(&cinfo);
+	fclose(outfile);
 
 
-  jpeg_destroy_compress(&cinfo);
+	jpeg_destroy_compress(&cinfo);
 
 }

main.c

@@ -15,10 +15,10 @@
 	-o output file
 	-v version
 	-l lossless
-	-s 
+	-s scale
 	-h help
 	-R recursive
-	
+
 */
 
 cclt_compress_parameters parse_arguments(int argc, char* argv[]) {
@@ -36,16 +36,16 @@ cclt_compress_parameters parse_arguments(int argc, char* argv[]) {
 				break;
 			case '?':
 				if (optopt == 'q' || optopt == 'e' || optopt == 'o' || optopt == 's') {
-          			//fprintf (stderr, "Option -%c requires an argument.\n", optopt);
-          			//Arguments without values
-          			exit(-1);
+					//fprintf (stderr, "Option -%c requires an argument.\n", optopt);
+					//Arguments without values
+					exit(-1);
 				}
-        		else if (isprint(optopt))  {
-          			fprintf (stderr, "Unknown option `-%c'.\n", optopt);
-        		}
-          		else {
+				else if (isprint(optopt))  {
+					fprintf (stderr, "Unknown option `-%c'.\n", optopt);
+				}
+				else {
 					fprintf (stderr, "Unknown option character `\\x%x'.\n", optopt);
-          		}
+				}
 				break;
 			case 'q':
 				qvalue = optarg;
@@ -54,15 +54,15 @@ cclt_compress_parameters parse_arguments(int argc, char* argv[]) {
 				evalue = optarg;
 				break;
 			default:
-        		abort();
+				abort();
 		}
 	}
-	
+
 	return parameters;
 }
 
 int main (int argc, char *argv[]) {
-	
+
 	cclt_compress_parameters parameters;
 
 	//Check if there's at least one argument
@@ -70,7 +70,7 @@ int main (int argc, char *argv[]) {
 		printf("CCLT requires at least one argument. Aborting.\n");
 		return -1;
 	}
-	
+
 	parameters = parse_arguments(argc, argv);
 
 	return 0;