COMP: ijg compiles now with '-pedantic -Werror' this way this is more VC6 compliant

[gdcm.git] / src / jpeg / libijg / jutils.c

diff --git a/src/jpeg/libijg/jutils.c b/src/jpeg/libijg/jutils.c
index d18a9555621bae9dce0b814e8afc7c05e877a4cb..23abeb881f8a1cdc7474d2e53c6add73250ab8d3 100644 (file)
--- a/src/jpeg/libijg/jutils.c
+++ b/src/jpeg/libijg/jutils.c
@@ -21,7 +21,7 @@
  * of a DCT block read in natural order (left to right, top to bottom).
  */
 
-#if 0                          /* This table is not actually needed in v6a */
+#if 0        /* This table is not actually needed in v6a */
 
 const int jpeg_zigzag_order[DCTSIZE2] = {
    0,  1,  5,  6, 14, 15, 27, 28,
@@ -96,21 +96,21 @@ jround_up (long a, long b)
  * is not all that great, because these routines aren't very heavily used.)
  */
 
-#ifndef NEED_FAR_POINTERS      /* normal case, same as regular macros */
-#define FMEMCOPY(dest,src,size)        MEMCOPY(dest,src,size)
-#define FMEMZERO(target,size)  MEMZERO(target,size)
-#else                          /* 80x86 case, define if we can */
+#ifndef NEED_FAR_POINTERS  /* normal case, same as regular macros */
+#define FMEMCOPY(dest,src,size)  MEMCOPY(dest,src,size)
+#define FMEMZERO(target,size)  MEMZERO(target,size)
+#else        /* 80x86 case, define if we can */
 #ifdef USE_FMEM
-#define FMEMCOPY(dest,src,size)        _fmemcpy((void FAR *)(dest), (const void FAR *)(src), (size_t)(size))
-#define FMEMZERO(target,size)  _fmemset((void FAR *)(target), 0, (size_t)(size))
+#define FMEMCOPY(dest,src,size)  _fmemcpy((void FAR *)(dest), (const void FAR *)(src), (size_t)(size))
+#define FMEMZERO(target,size)  _fmemset((void FAR *)(target), 0, (size_t)(size))
 #endif
 #endif
 
 
 GLOBAL(void)
 jcopy_sample_rows (JSAMPARRAY input_array, int source_row,
-                  JSAMPARRAY output_array, int dest_row,
-                  int num_rows, JDIMENSION num_cols)
+       JSAMPARRAY output_array, int dest_row,
+       int num_rows, JDIMENSION num_cols)
 /* Copy some rows of samples from one place to another.
  * num_rows rows are copied from input_array[source_row++]
  * to output_array[dest_row++]; these areas may overlap for duplication.
@@ -135,7 +135,7 @@ jcopy_sample_rows (JSAMPARRAY input_array, int source_row,
     FMEMCOPY(outptr, inptr, count);
 #else
     for (count = num_cols; count > 0; count--)
-      *outptr++ = *inptr++;    /* needn't bother with GETJSAMPLE() here */
+      *outptr++ = *inptr++;  /* needn't bother with GETJSAMPLE() here */
 #endif
   }
 }
@@ -143,7 +143,7 @@ jcopy_sample_rows (JSAMPARRAY input_array, int source_row,
 
 GLOBAL(void)
 jcopy_block_row (JBLOCKROW input_row, JBLOCKROW output_row,
-                JDIMENSION num_blocks)
+     JDIMENSION num_blocks)
 /* Copy a row of coefficient blocks from one place to another. */
 {
 #ifdef FMEMCOPY