Merge from branch 3.0

rtengine/jdatasrc.c

@@ -1,13 +1,13 @@
-#include <stdio.h>
-#include <jpeglib.h>
-#include <jerror.h>
-#include "jpeg.h"
-
+#include <stdio.h>
+#include <jpeglib.h>
+#include <jerror.h>
+#include "jpeg.h"
+
 /*
  * jdatasrc.c
  *
  * Copyright (C) 1994-1996, Thomas G. Lane.
- * Modified 2009-2010 by Guido Vollbeding.
+ * Modified 2009-2010 by Guido Vollbeding.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
  *
@@ -22,20 +22,20 @@
 
 /* this is not a core library module, so it doesn't define JPEG_INTERNALS */
 //#include "jinclude.h"
-
-#define JFREAD(file,buf,sizeofbuf)  \
-  ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
-#define JFWRITE(file,buf,sizeofbuf)  \
-  ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
-
-
+
+#define JFREAD(file,buf,sizeofbuf)  \
+  ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
+#define JFWRITE(file,buf,sizeofbuf)  \
+  ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file)))
+
+
 
 
 /* Expanded data source object for stdio input */
 
 typedef struct {
   struct jpeg_source_mgr pub;	/* public fields */
-  jmp_buf error_jmp_buf; /* error handler for this instance */
+  jmp_buf error_jmp_buf; /* error handler for this instance */
 
   FILE * infile;		/* source stream */
   JOCTET * buffer;		/* start of buffer */
@@ -228,7 +228,7 @@ my_jpeg_stdio_src (j_decompress_ptr cinfo, FILE * infile)
 
 METHODDEF(void)
 my_error_exit (j_common_ptr cinfo)
-{
+{
   /* Always display the message */
   (*cinfo->err->output_message) (cinfo);