diff options
| author | Thomas G. Lane <tgl@netcom.com> | 1996-02-07 00:00:00 +0000 |
|---|---|---|
| committer | DRC <information@libjpeg-turbo.org> | 2015-07-29 15:32:35 -0500 |
| commit | 489583f5165e05d37302e8eeec58104ea0109127 (patch) | |
| tree | af025016f71386106390afe4db314878cd42c6b5 /jpegtran.c | |
| parent | bc79e0680a45d1ca330d690dae0340c8e17ab5e3 (diff) | |
| download | libjpeg-turbo-489583f5165e05d37302e8eeec58104ea0109127.tar.gz | |
The Independent JPEG Group's JPEG software v6a
Diffstat (limited to 'jpegtran.c')
| -rw-r--r-- | jpegtran.c | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -1,7 +1,7 @@ /* * jpegtran.c * - * Copyright (C) 1995, Thomas G. Lane. + * Copyright (C) 1995-1996, 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. * @@ -15,7 +15,8 @@ #ifdef USE_CCOMMAND /* command-line reader for Macintosh */ #ifdef __MWERKS__ -#include <SIOUX.h> /* Metrowerks declares it here */ +#include <SIOUX.h> /* Metrowerks needs this */ +#include <console.h> /* ... and this */ #endif #ifdef THINK_C #include <console.h> /* Think declares it here */ @@ -36,7 +37,7 @@ static const char * progname; /* program name for error messages */ static char * outfilename; /* for -outfile switch */ -LOCAL void +LOCAL(void) usage (void) /* complain about bad command line */ { @@ -70,7 +71,7 @@ usage (void) } -LOCAL int +LOCAL(int) parse_switches (j_compress_ptr cinfo, int argc, char **argv, int last_file_arg_seen, boolean for_real) /* Parse optional switches. @@ -229,7 +230,7 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv, * The main program. */ -GLOBAL int +int main (int argc, char **argv) { struct jpeg_decompress_struct srcinfo; @@ -274,6 +275,7 @@ main (int argc, char **argv) file_index = parse_switches(&dstinfo, argc, argv, 0, FALSE); jsrcerr.trace_level = jdsterr.trace_level; + srcinfo.mem->max_memory_to_use = dstinfo.mem->max_memory_to_use; #ifdef TWO_FILE_COMMANDLINE /* Must have either -outfile switch or explicit output file name */ |