| Index: jdtrans.c
|
| diff --git a/jdtrans.c b/jdtrans.c
|
| index f0cd0aef95f8d9ab580269008bd3f52961307de2..cfc85dd24ca1ddf9e5d31b1db2136e2f37f101ee 100644
|
| --- a/jdtrans.c
|
| +++ b/jdtrans.c
|
| @@ -1,9 +1,12 @@
|
| /*
|
| * jdtrans.c
|
| *
|
| + * This file was part of the Independent JPEG Group's software:
|
| * Copyright (C) 1995-1997, Thomas G. Lane.
|
| - * This file is part of the Independent JPEG Group's software.
|
| - * For conditions of distribution and use, see the accompanying README file.
|
| + * It was modified by The libjpeg-turbo Project to include only code relevant
|
| + * to libjpeg-turbo.
|
| + * For conditions of distribution and use, see the accompanying README.ijg
|
| + * file.
|
| *
|
| * This file contains library routines for transcoding decompression,
|
| * that is, reading raw DCT coefficient arrays from an input JPEG file.
|
| @@ -16,7 +19,7 @@
|
|
|
|
|
| /* Forward declarations */
|
| -LOCAL(void) transdecode_master_selection JPP((j_decompress_ptr cinfo));
|
| +LOCAL(void) transdecode_master_selection (j_decompress_ptr cinfo);
|
|
|
|
|
| /*
|
| @@ -55,20 +58,20 @@ jpeg_read_coefficients (j_decompress_ptr cinfo)
|
| int retcode;
|
| /* Call progress monitor hook if present */
|
| if (cinfo->progress != NULL)
|
| - (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
|
| + (*cinfo->progress->progress_monitor) ((j_common_ptr) cinfo);
|
| /* Absorb some more input */
|
| retcode = (*cinfo->inputctl->consume_input) (cinfo);
|
| if (retcode == JPEG_SUSPENDED)
|
| - return NULL;
|
| + return NULL;
|
| if (retcode == JPEG_REACHED_EOI)
|
| - break;
|
| + break;
|
| /* Advance progress counter if appropriate */
|
| if (cinfo->progress != NULL &&
|
| - (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {
|
| - if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {
|
| - /* startup underestimated number of scans; ratchet up one scan */
|
| - cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;
|
| - }
|
| + (retcode == JPEG_ROW_COMPLETED || retcode == JPEG_REACHED_SOS)) {
|
| + if (++cinfo->progress->pass_counter >= cinfo->progress->pass_limit) {
|
| + /* startup underestimated number of scans; ratchet up one scan */
|
| + cinfo->progress->pass_limit += (long) cinfo->total_iMCU_rows;
|
| + }
|
| }
|
| }
|
| /* Set state so that jpeg_finish_decompress does the right thing */
|
| @@ -84,7 +87,7 @@ jpeg_read_coefficients (j_decompress_ptr cinfo)
|
| }
|
| /* Oops, improper usage */
|
| ERREXIT1(cinfo, JERR_BAD_STATE, cinfo->global_state);
|
| - return NULL; /* keep compiler happy */
|
| + return NULL; /* keep compiler happy */
|
| }
|
|
|
|
|
|
|