diff --git a/libImaging/JpegEncode.c b/libImaging/JpegEncode.c
index 221f8ccfa..87c3ba434 100644
--- a/libImaging/JpegEncode.c
+++ b/libImaging/JpegEncode.c
@@ -22,7 +22,7 @@
 
 #include "Imaging.h"
 
-#ifdef	HAVE_LIBJPEG
+#ifdef  HAVE_LIBJPEG
 
 #undef HAVE_PROTOTYPES
 #undef HAVE_STDLIB_H
@@ -36,7 +36,7 @@
 #include "Jpeg.h"
 
 /* -------------------------------------------------------------------- */
-/* Suspending output handler						*/
+/* Suspending output handler                                            */
 /* -------------------------------------------------------------------- */
 
 METHODDEF(void)
@@ -64,16 +64,16 @@ jpeg_buffer_dest(j_compress_ptr cinfo, JPEGDESTINATION* destination)
 
 
 /* -------------------------------------------------------------------- */
-/* Error handler							*/
+/* Error handler                                                        */
 /* -------------------------------------------------------------------- */
 
 METHODDEF(void)
 error(j_common_ptr cinfo)
 {
-  JPEGERROR* error;
-  error = (JPEGERROR*) cinfo->err;
-  (*cinfo->err->output_message) (cinfo);
-  longjmp(error->setjmp_buffer, 1);
+    JPEGERROR* error;
+    error = (JPEGERROR*) cinfo->err;
+    (*cinfo->err->output_message) (cinfo);
+    longjmp(error->setjmp_buffer, 1);
 }
 
 
@@ -146,59 +146,59 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
 
 	/* Use custom quantization tables */
 	if (context->qtables) {
-        int i;
-        int quality = 100;
-        if (context->quality > 0) {
-            quality = context->quality;
-        }
-        for (i = 0; i < sizeof(context->qtables)/sizeof(unsigned int); i++) {
-             // TODO: Should add support for none baseline
-            jpeg_add_quant_table(&context->cinfo, i, context->qtables[i],
-                quality, TRUE);
-        }
+	    int i;
+	    int quality = 100;
+	    if (context->quality > 0) {
+		quality = context->quality;
+	    }
+	    for (i = 0; i < sizeof(context->qtables)/sizeof(unsigned int); i++) {
+		// TODO: Should add support for none baseline
+		jpeg_add_quant_table(&context->cinfo, i, context->qtables[i],
+				     quality, TRUE);
+	    }
 	} else if (context->quality > 0) {
 	    jpeg_set_quality(&context->cinfo, context->quality, 1);
 	}
 
 	/* Set subsampling options */
 	switch (context->subsampling)
-	{
-		case 0:  /* 1x1 1x1 1x1 (4:4:4) : None */
+	    {
+	    case 0:  /* 1x1 1x1 1x1 (4:4:4) : None */
 		{
-			context->cinfo.comp_info[0].h_samp_factor = 1;
-			context->cinfo.comp_info[0].v_samp_factor = 1;
-			context->cinfo.comp_info[1].h_samp_factor = 1;
-			context->cinfo.comp_info[1].v_samp_factor = 1;
-			context->cinfo.comp_info[2].h_samp_factor = 1;
-			context->cinfo.comp_info[2].v_samp_factor = 1;
-			break;
+		    context->cinfo.comp_info[0].h_samp_factor = 1;
+		    context->cinfo.comp_info[0].v_samp_factor = 1;
+		    context->cinfo.comp_info[1].h_samp_factor = 1;
+		    context->cinfo.comp_info[1].v_samp_factor = 1;
+		    context->cinfo.comp_info[2].h_samp_factor = 1;
+		    context->cinfo.comp_info[2].v_samp_factor = 1;
+		    break;
 		}
-		case 1:  /* 2x1, 1x1, 1x1 (4:2:2) : Medium */
+	    case 1:  /* 2x1, 1x1, 1x1 (4:2:2) : Medium */
 		{
-			context->cinfo.comp_info[0].h_samp_factor = 2;
-			context->cinfo.comp_info[0].v_samp_factor = 1;
-			context->cinfo.comp_info[1].h_samp_factor = 1;
-			context->cinfo.comp_info[1].v_samp_factor = 1;
-			context->cinfo.comp_info[2].h_samp_factor = 1;
-			context->cinfo.comp_info[2].v_samp_factor = 1;
-			break;
+		    context->cinfo.comp_info[0].h_samp_factor = 2;
+		    context->cinfo.comp_info[0].v_samp_factor = 1;
+		    context->cinfo.comp_info[1].h_samp_factor = 1;
+		    context->cinfo.comp_info[1].v_samp_factor = 1;
+		    context->cinfo.comp_info[2].h_samp_factor = 1;
+		    context->cinfo.comp_info[2].v_samp_factor = 1;
+		    break;
 		}
-		case 2:  /* 2x2, 1x1, 1x1 (4:1:1) : High */
+	    case 2:  /* 2x2, 1x1, 1x1 (4:1:1) : High */
 		{
-			context->cinfo.comp_info[0].h_samp_factor = 2;
-			context->cinfo.comp_info[0].v_samp_factor = 2;
-			context->cinfo.comp_info[1].h_samp_factor = 1;
-			context->cinfo.comp_info[1].v_samp_factor = 1;
-			context->cinfo.comp_info[2].h_samp_factor = 1;
-			context->cinfo.comp_info[2].v_samp_factor = 1;
-			break;
+		    context->cinfo.comp_info[0].h_samp_factor = 2;
+		    context->cinfo.comp_info[0].v_samp_factor = 2;
+		    context->cinfo.comp_info[1].h_samp_factor = 1;
+		    context->cinfo.comp_info[1].v_samp_factor = 1;
+		    context->cinfo.comp_info[2].h_samp_factor = 1;
+		    context->cinfo.comp_info[2].v_samp_factor = 1;
+		    break;
 		}
-		default:
+	    default:
 		{
-			/* Use the lib's default */
-			break;
+		    /* Use the lib's default */
+		    break;
 		}
-	}
+	    }
 	if (context->progressive)
 	    jpeg_simple_progression(&context->cinfo);
 	context->cinfo.smoothing_factor = context->smooth;
@@ -219,19 +219,19 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
 	    jpeg_start_compress(&context->cinfo, FALSE);
             /* suppress extra section */
             context->extra_offset = context->extra_size;
-        //add exif header
-        if (context->rawExifLen > 0)
-            jpeg_write_marker(&context->cinfo, JPEG_APP0+1, (unsigned char*)context->rawExif, context->rawExifLen);
+	    //add exif header
+	    if (context->rawExifLen > 0)
+		jpeg_write_marker(&context->cinfo, JPEG_APP0+1, (unsigned char*)context->rawExif, context->rawExifLen);
 
 	    break;
 	default:
 	    /* interchange stream */
 	    jpeg_start_compress(&context->cinfo, TRUE);
-        //add exif header
-        if (context->rawExifLen > 0)
-            jpeg_write_marker(&context->cinfo, JPEG_APP0+1, (unsigned char*)context->rawExif, context->rawExifLen);
+	    //add exif header
+	    if (context->rawExifLen > 0)
+		jpeg_write_marker(&context->cinfo, JPEG_APP0+1, (unsigned char*)context->rawExif, context->rawExifLen);
 
-        break;
+	    break;
 	}
 	state->state++;
 	/* fall through */
@@ -253,7 +253,7 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
             else
                 break;
         } else
-              state->state++;
+	    state->state++;
 
     case 3: