ENH: Fix warnings about 'main' being used as local var... and replace tabs with two...

diff --git a/src/jpeg/libijg/jcmainct.c b/src/jpeg/libijg/jcmainct.c
index e0279a7e017a2ee5a3c6f5bc434e220ddcebbfc5..0b30159f98ef4970688404bb9a9660a9a32a12df 100644 (file)
--- a/src/jpeg/libijg/jcmainct.c
+++ b/src/jpeg/libijg/jcmainct.c
@@ -28,10 +28,10 @@
 typedef struct {
   struct jpeg_c_main_controller pub; /* public fields */
 
-  JDIMENSION cur_iMCU_row;     /* number of current iMCU row */
-  JDIMENSION rowgroup_ctr;     /* counts row groups received in iMCU row */
-  boolean suspended;           /* remember if we suspended output */
-  J_BUF_MODE pass_mode;                /* current operating mode */
+  JDIMENSION cur_iMCU_row;  /* number of current iMCU row */
+  JDIMENSION rowgroup_ctr;  /* counts row groups received in iMCU row */
+  boolean suspended;    /* remember if we suspended output */
+  J_BUF_MODE pass_mode;    /* current operating mode */
 
   /* If using just a strip buffer, this points to the entire set of buffers
    * (we allocate one for each component).  In the full-image case, this
@@ -52,12 +52,12 @@ typedef my_main_controller * my_main_ptr;
 
 /* Forward declarations */
 METHODDEF(void) process_data_simple_main
-       JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
-            JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
+  JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
+       JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
 #ifdef FULL_MAIN_BUFFER_SUPPORTED
 METHODDEF(void) process_data_buffer_main
-       JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
-            JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
+  JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
+       JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
 #endif
 
 
@@ -68,32 +68,32 @@ METHODDEF(void) process_data_buffer_main
 METHODDEF(void)
 start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
 {
-  my_main_ptr main = (my_main_ptr) cinfo->main;
+  my_main_ptr mainPtr = (my_main_ptr) cinfo->main;
 
   /* Do nothing in raw-data mode. */
   if (cinfo->raw_data_in)
     return;
 
-  main->cur_iMCU_row = 0;      /* initialize counters */
-  main->rowgroup_ctr = 0;
-  main->suspended = FALSE;
-  main->pass_mode = pass_mode; /* save mode for use by process_data */
+  mainPtr->cur_iMCU_row = 0;  /* initialize counters */
+  mainPtr->rowgroup_ctr = 0;
+  mainPtr->suspended = FALSE;
+  mainPtr->pass_mode = pass_mode;  /* save mode for use by process_data */
 
   switch (pass_mode) {
   case JBUF_PASS_THRU:
 #ifdef FULL_MAIN_BUFFER_SUPPORTED
-    if (main->whole_image[0] != NULL)
+    if (mainPtr->whole_image[0] != NULL)
       ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
 #endif
-    main->pub.process_data = process_data_simple_main;
+    mainPtr->pub.process_data = process_data_simple_main;
     break;
 #ifdef FULL_MAIN_BUFFER_SUPPORTED
   case JBUF_SAVE_SOURCE:
   case JBUF_CRANK_DEST:
   case JBUF_SAVE_AND_PASS:
-    if (main->whole_image[0] == NULL)
+    if (mainPtr->whole_image[0] == NULL)
       ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    main->pub.process_data = process_data_buffer_main;
+    mainPtr->pub.process_data = process_data_buffer_main;
     break;
 #endif
   default:
@@ -111,49 +111,49 @@ start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
 
 METHODDEF(void)
 process_data_simple_main (j_compress_ptr cinfo,
-                         JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-                         JDIMENSION in_rows_avail)
+        JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+        JDIMENSION in_rows_avail)
 {
-  my_main_ptr main = (my_main_ptr) cinfo->main;
+  my_main_ptr mainPtr = (my_main_ptr) cinfo->main;
 
-  while (main->cur_iMCU_row < cinfo->total_iMCU_rows) {
+  while (mainPtr->cur_iMCU_row < cinfo->total_iMCU_rows) {
     /* Read input data if we haven't filled the main buffer yet */
-    if (main->rowgroup_ctr < DCTSIZE)
+    if (mainPtr->rowgroup_ctr < DCTSIZE)
       (*cinfo->prep->pre_process_data) (cinfo,
-                                       input_buf, in_row_ctr, in_rows_avail,
-                                       main->buffer, &main->rowgroup_ctr,
-                                       (JDIMENSION) DCTSIZE);
+          input_buf, in_row_ctr, in_rows_avail,
+          mainPtr->buffer, &mainPtr->rowgroup_ctr,
+          (JDIMENSION) DCTSIZE);
 
     /* If we don't have a full iMCU row buffered, return to application for
      * more data.  Note that preprocessor will always pad to fill the iMCU row
      * at the bottom of the image.
      */
-    if (main->rowgroup_ctr != DCTSIZE)
+    if (mainPtr->rowgroup_ctr != DCTSIZE)
       return;
 
     /* Send the completed row to the compressor */
-    if (! (*cinfo->coef->compress_data) (cinfo, main->buffer)) {
+    if (! (*cinfo->coef->compress_data) (cinfo, mainPtr->buffer)) {
       /* If compressor did not consume the whole row, then we must need to
        * suspend processing and return to the application.  In this situation
        * we pretend we didn't yet consume the last input row; otherwise, if
        * it happened to be the last row of the image, the application would
        * think we were done.
        */
-      if (! main->suspended) {
-       (*in_row_ctr)--;
-       main->suspended = TRUE;
+      if (! mainPtr->suspended) {
+  (*in_row_ctr)--;
+  mainPtr->suspended = TRUE;
       }
       return;
     }
     /* We did finish the row.  Undo our little suspension hack if a previous
      * call suspended; then mark the main buffer empty.
      */
-    if (main->suspended) {
+    if (mainPtr->suspended) {
       (*in_row_ctr)++;
-      main->suspended = FALSE;
+      mainPtr->suspended = FALSE;
     }
-    main->rowgroup_ctr = 0;
-    main->cur_iMCU_row++;
+    mainPtr->rowgroup_ctr = 0;
+    mainPtr->cur_iMCU_row++;
   }
 }
 
@@ -167,28 +167,28 @@ process_data_simple_main (j_compress_ptr cinfo,
 
 METHODDEF(void)
 process_data_buffer_main (j_compress_ptr cinfo,
-                         JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-                         JDIMENSION in_rows_avail)
+        JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+        JDIMENSION in_rows_avail)
 {
-  my_main_ptr main = (my_main_ptr) cinfo->main;
+  my_main_ptr mainPtr = (my_main_ptr) cinfo->main;
   int ci;
   jpeg_component_info *compptr;
-  boolean writing = (main->pass_mode != JBUF_CRANK_DEST);
+  boolean writing = (mainPtr->pass_mode != JBUF_CRANK_DEST);
 
-  while (main->cur_iMCU_row < cinfo->total_iMCU_rows) {
+  while (mainPtr->cur_iMCU_row < cinfo->total_iMCU_rows) {
     /* Realign the virtual buffers if at the start of an iMCU row. */
-    if (main->rowgroup_ctr == 0) {
+    if (mainPtr->rowgroup_ctr == 0) {
       for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-          ci++, compptr++) {
-       main->buffer[ci] = (*cinfo->mem->access_virt_sarray)
-         ((j_common_ptr) cinfo, main->whole_image[ci],
-          main->cur_iMCU_row * (compptr->v_samp_factor * DCTSIZE),
-          (JDIMENSION) (compptr->v_samp_factor * DCTSIZE), writing);
+     ci++, compptr++) {
+  mainPtr->buffer[ci] = (*cinfo->mem->access_virt_sarray)
+    ((j_common_ptr) cinfo, mainPtr->whole_image[ci],
+     mainPtr->cur_iMCU_row * (compptr->v_samp_factor * DCTSIZE),
+     (JDIMENSION) (compptr->v_samp_factor * DCTSIZE), writing);
       }
       /* In a read pass, pretend we just read some source data. */
       if (! writing) {
-       *in_row_ctr += cinfo->max_v_samp_factor * DCTSIZE;
-       main->rowgroup_ctr = DCTSIZE;
+  *in_row_ctr += cinfo->max_v_samp_factor * DCTSIZE;
+  mainPtr->rowgroup_ctr = DCTSIZE;
       }
     }
 
@@ -196,41 +196,41 @@ process_data_buffer_main (j_compress_ptr cinfo,
     /* Note: preprocessor will pad if necessary to fill the last iMCU row. */
     if (writing) {
       (*cinfo->prep->pre_process_data) (cinfo,
-                                       input_buf, in_row_ctr, in_rows_avail,
-                                       main->buffer, &main->rowgroup_ctr,
-                                       (JDIMENSION) DCTSIZE);
+          input_buf, in_row_ctr, in_rows_avail,
+          mainPtr->buffer, &mainPtr->rowgroup_ctr,
+          (JDIMENSION) DCTSIZE);
       /* Return to application if we need more data to fill the iMCU row. */
-      if (main->rowgroup_ctr < DCTSIZE)
-       return;
+      if (mainPtr->rowgroup_ctr < DCTSIZE)
+  return;
     }
 
     /* Emit data, unless this is a sink-only pass. */
-    if (main->pass_mode != JBUF_SAVE_SOURCE) {
-      if (! (*cinfo->coef->compress_data) (cinfo, main->buffer)) {
-       /* If compressor did not consume the whole row, then we must need to
-        * suspend processing and return to the application.  In this situation
-        * we pretend we didn't yet consume the last input row; otherwise, if
-        * it happened to be the last row of the image, the application would
-        * think we were done.
-        */
-       if (! main->suspended) {
-         (*in_row_ctr)--;
-         main->suspended = TRUE;
-       }
-       return;
+    if (mainPtr->pass_mode != JBUF_SAVE_SOURCE) {
+      if (! (*cinfo->coef->compress_data) (cinfo, mainPtr->buffer)) {
+  /* If compressor did not consume the whole row, then we must need to
+   * suspend processing and return to the application.  In this situation
+   * we pretend we didn't yet consume the last input row; otherwise, if
+   * it happened to be the last row of the image, the application would
+   * think we were done.
+   */
+  if (! mainPtr->suspended) {
+    (*in_row_ctr)--;
+    mainPtr->suspended = TRUE;
+  }
+  return;
       }
       /* We did finish the row.  Undo our little suspension hack if a previous
        * call suspended; then mark the main buffer empty.
        */
-      if (main->suspended) {
-       (*in_row_ctr)++;
-       main->suspended = FALSE;
+      if (mainPtr->suspended) {
+  (*in_row_ctr)++;
+  mainPtr->suspended = FALSE;
       }
     }
 
     /* If get here, we are done with this iMCU row.  Mark buffer empty. */
-    main->rowgroup_ctr = 0;
-    main->cur_iMCU_row++;
+    mainPtr->rowgroup_ctr = 0;
+    mainPtr->cur_iMCU_row++;
   }
 }
 
@@ -244,15 +244,15 @@ process_data_buffer_main (j_compress_ptr cinfo,
 GLOBAL(void)
 jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer)
 {
-  my_main_ptr main;
+  my_main_ptr mainPtr;
   int ci;
   jpeg_component_info *compptr;
 
-  main = (my_main_ptr)
+  mainPtr = (my_main_ptr)
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-                               SIZEOF(my_main_controller));
-  cinfo->main = (struct jpeg_c_main_controller *) main;
-  main->pub.start_pass = start_pass_main;
+        SIZEOF(my_main_controller));
+  cinfo->main = (struct jpeg_c_main_controller *) mainPtr;
+  mainPtr->pub.start_pass = start_pass_main;
 
   /* We don't need to create a buffer in raw-data mode. */
   if (cinfo->raw_data_in)
@@ -266,28 +266,28 @@ jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer)
     /* Allocate a full-image virtual array for each component */
     /* Note we pad the bottom to a multiple of the iMCU height */
     for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-        ci++, compptr++) {
-      main->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
-       ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
-        compptr->width_in_blocks * DCTSIZE,
-        (JDIMENSION) jround_up((long) compptr->height_in_blocks,
-                               (long) compptr->v_samp_factor) * DCTSIZE,
-        (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
+   ci++, compptr++) {
+      mainPtr->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
+  ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+   compptr->width_in_blocks * DCTSIZE,
+   (JDIMENSION) jround_up((long) compptr->height_in_blocks,
+        (long) compptr->v_samp_factor) * DCTSIZE,
+   (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
     }
 #else
     ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
 #endif
   } else {
 #ifdef FULL_MAIN_BUFFER_SUPPORTED
-    main->whole_image[0] = NULL; /* flag for no virtual arrays */
+    mainPtr->whole_image[0] = NULL; /* flag for no virtual arrays */
 #endif
     /* Allocate a strip buffer for each component */
     for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-        ci++, compptr++) {
-      main->buffer[ci] = (*cinfo->mem->alloc_sarray)
-       ((j_common_ptr) cinfo, JPOOL_IMAGE,
-        compptr->width_in_blocks * DCTSIZE,
-        (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
+   ci++, compptr++) {
+      mainPtr->buffer[ci] = (*cinfo->mem->alloc_sarray)
+  ((j_common_ptr) cinfo, JPOOL_IMAGE,
+   compptr->width_in_blocks * DCTSIZE,
+   (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
     }
   }
 }

diff --git a/src/jpeg/libijg8/jcmainct.c b/src/jpeg/libijg8/jcmainct.c
index e0279a7e017a2ee5a3c6f5bc434e220ddcebbfc5..0b30159f98ef4970688404bb9a9660a9a32a12df 100644 (file)
--- a/src/jpeg/libijg8/jcmainct.c
+++ b/src/jpeg/libijg8/jcmainct.c
@@ -28,10 +28,10 @@
 typedef struct {
   struct jpeg_c_main_controller pub; /* public fields */
 
-  JDIMENSION cur_iMCU_row;     /* number of current iMCU row */
-  JDIMENSION rowgroup_ctr;     /* counts row groups received in iMCU row */
-  boolean suspended;           /* remember if we suspended output */
-  J_BUF_MODE pass_mode;                /* current operating mode */
+  JDIMENSION cur_iMCU_row;  /* number of current iMCU row */
+  JDIMENSION rowgroup_ctr;  /* counts row groups received in iMCU row */
+  boolean suspended;    /* remember if we suspended output */
+  J_BUF_MODE pass_mode;    /* current operating mode */
 
   /* If using just a strip buffer, this points to the entire set of buffers
    * (we allocate one for each component).  In the full-image case, this
@@ -52,12 +52,12 @@ typedef my_main_controller * my_main_ptr;
 
 /* Forward declarations */
 METHODDEF(void) process_data_simple_main
-       JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
-            JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
+  JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
+       JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
 #ifdef FULL_MAIN_BUFFER_SUPPORTED
 METHODDEF(void) process_data_buffer_main
-       JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
-            JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
+  JPP((j_compress_ptr cinfo, JSAMPARRAY input_buf,
+       JDIMENSION *in_row_ctr, JDIMENSION in_rows_avail));
 #endif
 
 
@@ -68,32 +68,32 @@ METHODDEF(void) process_data_buffer_main
 METHODDEF(void)
 start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
 {
-  my_main_ptr main = (my_main_ptr) cinfo->main;
+  my_main_ptr mainPtr = (my_main_ptr) cinfo->main;
 
   /* Do nothing in raw-data mode. */
   if (cinfo->raw_data_in)
     return;
 
-  main->cur_iMCU_row = 0;      /* initialize counters */
-  main->rowgroup_ctr = 0;
-  main->suspended = FALSE;
-  main->pass_mode = pass_mode; /* save mode for use by process_data */
+  mainPtr->cur_iMCU_row = 0;  /* initialize counters */
+  mainPtr->rowgroup_ctr = 0;
+  mainPtr->suspended = FALSE;
+  mainPtr->pass_mode = pass_mode;  /* save mode for use by process_data */
 
   switch (pass_mode) {
   case JBUF_PASS_THRU:
 #ifdef FULL_MAIN_BUFFER_SUPPORTED
-    if (main->whole_image[0] != NULL)
+    if (mainPtr->whole_image[0] != NULL)
       ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
 #endif
-    main->pub.process_data = process_data_simple_main;
+    mainPtr->pub.process_data = process_data_simple_main;
     break;
 #ifdef FULL_MAIN_BUFFER_SUPPORTED
   case JBUF_SAVE_SOURCE:
   case JBUF_CRANK_DEST:
   case JBUF_SAVE_AND_PASS:
-    if (main->whole_image[0] == NULL)
+    if (mainPtr->whole_image[0] == NULL)
       ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
-    main->pub.process_data = process_data_buffer_main;
+    mainPtr->pub.process_data = process_data_buffer_main;
     break;
 #endif
   default:
@@ -111,49 +111,49 @@ start_pass_main (j_compress_ptr cinfo, J_BUF_MODE pass_mode)
 
 METHODDEF(void)
 process_data_simple_main (j_compress_ptr cinfo,
-                         JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-                         JDIMENSION in_rows_avail)
+        JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+        JDIMENSION in_rows_avail)
 {
-  my_main_ptr main = (my_main_ptr) cinfo->main;
+  my_main_ptr mainPtr = (my_main_ptr) cinfo->main;
 
-  while (main->cur_iMCU_row < cinfo->total_iMCU_rows) {
+  while (mainPtr->cur_iMCU_row < cinfo->total_iMCU_rows) {
     /* Read input data if we haven't filled the main buffer yet */
-    if (main->rowgroup_ctr < DCTSIZE)
+    if (mainPtr->rowgroup_ctr < DCTSIZE)
       (*cinfo->prep->pre_process_data) (cinfo,
-                                       input_buf, in_row_ctr, in_rows_avail,
-                                       main->buffer, &main->rowgroup_ctr,
-                                       (JDIMENSION) DCTSIZE);
+          input_buf, in_row_ctr, in_rows_avail,
+          mainPtr->buffer, &mainPtr->rowgroup_ctr,
+          (JDIMENSION) DCTSIZE);
 
     /* If we don't have a full iMCU row buffered, return to application for
      * more data.  Note that preprocessor will always pad to fill the iMCU row
      * at the bottom of the image.
      */
-    if (main->rowgroup_ctr != DCTSIZE)
+    if (mainPtr->rowgroup_ctr != DCTSIZE)
       return;
 
     /* Send the completed row to the compressor */
-    if (! (*cinfo->coef->compress_data) (cinfo, main->buffer)) {
+    if (! (*cinfo->coef->compress_data) (cinfo, mainPtr->buffer)) {
       /* If compressor did not consume the whole row, then we must need to
        * suspend processing and return to the application.  In this situation
        * we pretend we didn't yet consume the last input row; otherwise, if
        * it happened to be the last row of the image, the application would
        * think we were done.
        */
-      if (! main->suspended) {
-       (*in_row_ctr)--;
-       main->suspended = TRUE;
+      if (! mainPtr->suspended) {
+  (*in_row_ctr)--;
+  mainPtr->suspended = TRUE;
       }
       return;
     }
     /* We did finish the row.  Undo our little suspension hack if a previous
      * call suspended; then mark the main buffer empty.
      */
-    if (main->suspended) {
+    if (mainPtr->suspended) {
       (*in_row_ctr)++;
-      main->suspended = FALSE;
+      mainPtr->suspended = FALSE;
     }
-    main->rowgroup_ctr = 0;
-    main->cur_iMCU_row++;
+    mainPtr->rowgroup_ctr = 0;
+    mainPtr->cur_iMCU_row++;
   }
 }
 
@@ -167,28 +167,28 @@ process_data_simple_main (j_compress_ptr cinfo,
 
 METHODDEF(void)
 process_data_buffer_main (j_compress_ptr cinfo,
-                         JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
-                         JDIMENSION in_rows_avail)
+        JSAMPARRAY input_buf, JDIMENSION *in_row_ctr,
+        JDIMENSION in_rows_avail)
 {
-  my_main_ptr main = (my_main_ptr) cinfo->main;
+  my_main_ptr mainPtr = (my_main_ptr) cinfo->main;
   int ci;
   jpeg_component_info *compptr;
-  boolean writing = (main->pass_mode != JBUF_CRANK_DEST);
+  boolean writing = (mainPtr->pass_mode != JBUF_CRANK_DEST);
 
-  while (main->cur_iMCU_row < cinfo->total_iMCU_rows) {
+  while (mainPtr->cur_iMCU_row < cinfo->total_iMCU_rows) {
     /* Realign the virtual buffers if at the start of an iMCU row. */
-    if (main->rowgroup_ctr == 0) {
+    if (mainPtr->rowgroup_ctr == 0) {
       for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-          ci++, compptr++) {
-       main->buffer[ci] = (*cinfo->mem->access_virt_sarray)
-         ((j_common_ptr) cinfo, main->whole_image[ci],
-          main->cur_iMCU_row * (compptr->v_samp_factor * DCTSIZE),
-          (JDIMENSION) (compptr->v_samp_factor * DCTSIZE), writing);
+     ci++, compptr++) {
+  mainPtr->buffer[ci] = (*cinfo->mem->access_virt_sarray)
+    ((j_common_ptr) cinfo, mainPtr->whole_image[ci],
+     mainPtr->cur_iMCU_row * (compptr->v_samp_factor * DCTSIZE),
+     (JDIMENSION) (compptr->v_samp_factor * DCTSIZE), writing);
       }
       /* In a read pass, pretend we just read some source data. */
       if (! writing) {
-       *in_row_ctr += cinfo->max_v_samp_factor * DCTSIZE;
-       main->rowgroup_ctr = DCTSIZE;
+  *in_row_ctr += cinfo->max_v_samp_factor * DCTSIZE;
+  mainPtr->rowgroup_ctr = DCTSIZE;
       }
     }
 
@@ -196,41 +196,41 @@ process_data_buffer_main (j_compress_ptr cinfo,
     /* Note: preprocessor will pad if necessary to fill the last iMCU row. */
     if (writing) {
       (*cinfo->prep->pre_process_data) (cinfo,
-                                       input_buf, in_row_ctr, in_rows_avail,
-                                       main->buffer, &main->rowgroup_ctr,
-                                       (JDIMENSION) DCTSIZE);
+          input_buf, in_row_ctr, in_rows_avail,
+          mainPtr->buffer, &mainPtr->rowgroup_ctr,
+          (JDIMENSION) DCTSIZE);
       /* Return to application if we need more data to fill the iMCU row. */
-      if (main->rowgroup_ctr < DCTSIZE)
-       return;
+      if (mainPtr->rowgroup_ctr < DCTSIZE)
+  return;
     }
 
     /* Emit data, unless this is a sink-only pass. */
-    if (main->pass_mode != JBUF_SAVE_SOURCE) {
-      if (! (*cinfo->coef->compress_data) (cinfo, main->buffer)) {
-       /* If compressor did not consume the whole row, then we must need to
-        * suspend processing and return to the application.  In this situation
-        * we pretend we didn't yet consume the last input row; otherwise, if
-        * it happened to be the last row of the image, the application would
-        * think we were done.
-        */
-       if (! main->suspended) {
-         (*in_row_ctr)--;
-         main->suspended = TRUE;
-       }
-       return;
+    if (mainPtr->pass_mode != JBUF_SAVE_SOURCE) {
+      if (! (*cinfo->coef->compress_data) (cinfo, mainPtr->buffer)) {
+  /* If compressor did not consume the whole row, then we must need to
+   * suspend processing and return to the application.  In this situation
+   * we pretend we didn't yet consume the last input row; otherwise, if
+   * it happened to be the last row of the image, the application would
+   * think we were done.
+   */
+  if (! mainPtr->suspended) {
+    (*in_row_ctr)--;
+    mainPtr->suspended = TRUE;
+  }
+  return;
       }
       /* We did finish the row.  Undo our little suspension hack if a previous
        * call suspended; then mark the main buffer empty.
        */
-      if (main->suspended) {
-       (*in_row_ctr)++;
-       main->suspended = FALSE;
+      if (mainPtr->suspended) {
+  (*in_row_ctr)++;
+  mainPtr->suspended = FALSE;
       }
     }
 
     /* If get here, we are done with this iMCU row.  Mark buffer empty. */
-    main->rowgroup_ctr = 0;
-    main->cur_iMCU_row++;
+    mainPtr->rowgroup_ctr = 0;
+    mainPtr->cur_iMCU_row++;
   }
 }
 
@@ -244,15 +244,15 @@ process_data_buffer_main (j_compress_ptr cinfo,
 GLOBAL(void)
 jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer)
 {
-  my_main_ptr main;
+  my_main_ptr mainPtr;
   int ci;
   jpeg_component_info *compptr;
 
-  main = (my_main_ptr)
+  mainPtr = (my_main_ptr)
     (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE,
-                               SIZEOF(my_main_controller));
-  cinfo->main = (struct jpeg_c_main_controller *) main;
-  main->pub.start_pass = start_pass_main;
+        SIZEOF(my_main_controller));
+  cinfo->main = (struct jpeg_c_main_controller *) mainPtr;
+  mainPtr->pub.start_pass = start_pass_main;
 
   /* We don't need to create a buffer in raw-data mode. */
   if (cinfo->raw_data_in)
@@ -266,28 +266,28 @@ jinit_c_main_controller (j_compress_ptr cinfo, boolean need_full_buffer)
     /* Allocate a full-image virtual array for each component */
     /* Note we pad the bottom to a multiple of the iMCU height */
     for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-        ci++, compptr++) {
-      main->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
-       ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
-        compptr->width_in_blocks * DCTSIZE,
-        (JDIMENSION) jround_up((long) compptr->height_in_blocks,
-                               (long) compptr->v_samp_factor) * DCTSIZE,
-        (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
+   ci++, compptr++) {
+      mainPtr->whole_image[ci] = (*cinfo->mem->request_virt_sarray)
+  ((j_common_ptr) cinfo, JPOOL_IMAGE, FALSE,
+   compptr->width_in_blocks * DCTSIZE,
+   (JDIMENSION) jround_up((long) compptr->height_in_blocks,
+        (long) compptr->v_samp_factor) * DCTSIZE,
+   (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
     }
 #else
     ERREXIT(cinfo, JERR_BAD_BUFFER_MODE);
 #endif
   } else {
 #ifdef FULL_MAIN_BUFFER_SUPPORTED
-    main->whole_image[0] = NULL; /* flag for no virtual arrays */
+    mainPtr->whole_image[0] = NULL; /* flag for no virtual arrays */
 #endif
     /* Allocate a strip buffer for each component */
     for (ci = 0, compptr = cinfo->comp_info; ci < cinfo->num_components;
-        ci++, compptr++) {
-      main->buffer[ci] = (*cinfo->mem->alloc_sarray)
-       ((j_common_ptr) cinfo, JPOOL_IMAGE,
-        compptr->width_in_blocks * DCTSIZE,
-        (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
+   ci++, compptr++) {
+      mainPtr->buffer[ci] = (*cinfo->mem->alloc_sarray)
+  ((j_common_ptr) cinfo, JPOOL_IMAGE,
+   compptr->width_in_blocks * DCTSIZE,
+   (JDIMENSION) (compptr->v_samp_factor * DCTSIZE));
     }
   }
 }