From 386b7d3366f1359a265da207a9cafa3edf553b64 Mon Sep 17 00:00:00 2001 From: Joshua Bakita Date: Mon, 7 Oct 2019 19:13:39 -0400 Subject: Reorganize and commit all the modified TACLeBench code and run scripts --- baseline/source/cjpeg_wrbmp/ChangeLog.txt | 104 ++++ baseline/source/cjpeg_wrbmp/README | 383 +++++++++++++ baseline/source/cjpeg_wrbmp/cderror.h | 140 +++++ baseline/source/cjpeg_wrbmp/cdjpeg.h | 105 ++++ baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c | 225 ++++++++ baseline/source/cjpeg_wrbmp/input.c | 79 +++ baseline/source/cjpeg_wrbmp/jconfig.h | 65 +++ baseline/source/cjpeg_wrbmp/jerror.h | 203 +++++++ baseline/source/cjpeg_wrbmp/jmorecfg.h | 95 ++++ baseline/source/cjpeg_wrbmp/jpeglib.h | 869 ++++++++++++++++++++++++++++++ 10 files changed, 2268 insertions(+) create mode 100644 baseline/source/cjpeg_wrbmp/ChangeLog.txt create mode 100644 baseline/source/cjpeg_wrbmp/README create mode 100644 baseline/source/cjpeg_wrbmp/cderror.h create mode 100644 baseline/source/cjpeg_wrbmp/cdjpeg.h create mode 100644 baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c create mode 100644 baseline/source/cjpeg_wrbmp/input.c create mode 100644 baseline/source/cjpeg_wrbmp/jconfig.h create mode 100644 baseline/source/cjpeg_wrbmp/jerror.h create mode 100644 baseline/source/cjpeg_wrbmp/jmorecfg.h create mode 100644 baseline/source/cjpeg_wrbmp/jpeglib.h (limited to 'baseline/source/cjpeg_wrbmp') diff --git a/baseline/source/cjpeg_wrbmp/ChangeLog.txt b/baseline/source/cjpeg_wrbmp/ChangeLog.txt new file mode 100644 index 0000000..df21770 --- /dev/null +++ b/baseline/source/cjpeg_wrbmp/ChangeLog.txt @@ -0,0 +1,104 @@ +File: cjpeg_jpeg6b_wrbmp.c +Original provenience: + +2017-04-18: +- Annotated cjpeg_wrbmp_main as entry-point for timing analysis + +2015-10-14: +- Remove comment on line 1 +- Added generic TACLeBench header to line 1 +- Changed struct name to cjpeg_jpeg6b_wrbmp_name +- Changed the global variable from {name} to cjpeg_jpeg6b_wrbmp_{name} +- Changed the functions from {name} to cjpeg_jpeg6b_wrbmp_{name} +- Removed code in comment +- Added cjpeg_jpeg6b_wrbmp_main() +- Added cjpeg_jpeg6b_wrbmp_return() +- Added cjpeg_jpeg6b_wrbmp_init() +- Added forward declaration of the functions +- Removed unused variables: test_image[] and color_map[] +- Applied Code Style + +File: input.c +Original provenience: + +2015-10-12: +- Remove comment on line 1 +- Added generic TACLeBench header to line 1 +- Removed _jpeg6b_ from the prefix +- Changed the global variable from colormap to cjpeg_jpeg6b_wrbmp_colormap +- Removed unused variables: test_image[] and color_map[] +- Moved initialization of cjpeg_jpeg6b_wrbmp_colormap to function. This function is called from cjpeg_jpeg6b_wrbmp_init function +- Applied Code Style + +File: cderror.h +Original provenience: + +2015-10-12: +- Remove comment on line 1 +- Added generic TACLeBench header to line 1 +- Removed _jpeg6b_ from the prefix +- Changed JMESSAGE to CJPEG_JPEG6B_WRBMP_JMESSAGE +- Changed JMAKE_ENUM_LIST to CJPEG_JPEG6B_WRBMP_JMAKE_ENUM_LIST +- Applied Code Style + + +File: cdjpeg.h +Original provenience: + +2015-10-12: +- Remove comment on line 1 +- Added generic TACLeBench header to line 1 +- Rename structs and typedef to cjpeg_jpeg6b_wrbmp_{name} +- Removed unused defines + +File: jconfig.h +Original provenience: + +2015-10-12: +- Remove comment on line 1 +- Added generic TACLeBench header to line 1 +- Change defines to CJPEG_JPEG6B_WRBMP_{NAME} +- Removed _jpeg6b_ from the prefix +- Applied Code Style + + +File: jerror.h +Original provenience: + +2015-10-12: +- Remove comment on line 1 +- Added generic TACLeBench header to line 1 +- Removed error and warning defines +- Removed _jpeg6b_ from the prefix +- Applied Code Style + + +File: jmorecfg.h +Original provenience: + +2015-10-12: +- Remove comment on line 1 +- Added generic TACLeBench header to line 1 +- Removed unused comments +- Removed _jpeg6b_ from the prefix +- Removed unused defines +- Removed unused typedefs +- Applied Code Style + + +File: jpeglib.h +Original provenience: + +2015-10-12: +- Remove comment on line 1 +- Used define value directly +- Remove unused typedefs, defines +- Removed _jpeg6b_ from the prefix +- Changed struct name to cjpeg_jpeg6b_wrbmp_{name} +- Changed define {name} to cjpeg_jpeg6b_wrbmp_{name} +- Added generic TACLeBench header to line 1 +- Applied Code Style + + + + diff --git a/baseline/source/cjpeg_wrbmp/README b/baseline/source/cjpeg_wrbmp/README new file mode 100644 index 0000000..fa69a18 --- /dev/null +++ b/baseline/source/cjpeg_wrbmp/README @@ -0,0 +1,383 @@ +The Independent JPEG Group's JPEG software +========================================== + +README for release 6a of 7-Feb-96 +================================= + +This distribution contains the sixth public release of the Independent JPEG +Group's free JPEG software. You are welcome to redistribute this software and +to use it for any purpose, subject to the conditions under LEGAL ISSUES, below. + +Serious users of this software (particularly those incorporating it into +larger programs) should contact IJG at jpeg-info@uunet.uu.net to be added to +our electronic mailing list. Mailing list members are notified of updates +and have a chance to participate in technical discussions, etc. + +This software is the work of Tom Lane, Philip Gladstone, Luis Ortiz, Jim +Boucher, Lee Crocker, Julian Minguillon, George Phillips, Davide Rossi, +Ge' Weijers, and other members of the Independent JPEG Group. + +IJG is not affiliated with the official ISO JPEG standards committee. + + +DOCUMENTATION ROADMAP +===================== + +This file contains the following sections: + +OVERVIEW General description of JPEG and the IJG software. +LEGAL ISSUES Copyright, lack of warranty, terms of distribution. +REFERENCES Where to learn more about JPEG. +ARCHIVE LOCATIONS Where to find newer versions of this software. +RELATED SOFTWARE Other stuff you should get. +FILE FORMAT WARS Software *not* to get. +TO DO Plans for future IJG releases. + +Other documentation files in the distribution are: + +User documentation: + install.doc How to configure and install the IJG software. + usage.doc Usage instructions for cjpeg, djpeg, jpegtran, + rdjpgcom, and wrjpgcom. + *.1 Unix-style man pages for programs (same info as usage.doc). + wizard.doc Advanced usage instructions for JPEG wizards only. + change.log Version-to-version change highlights. +Programmer and internal documentation: + libjpeg.doc How to use the JPEG library in your own programs. + example.c Sample code for calling the JPEG library. + structure.doc Overview of the JPEG library's internal structure. + filelist.doc Road map of IJG files. + coderules.doc Coding style rules --- please read if you contribute code. + +Please read at least the files install.doc and usage.doc. Useful information +can also be found in the JPEG FAQ (Frequently Asked Questions) article. See +ARCHIVE LOCATIONS below to find out where to obtain the FAQ article. + +If you want to understand how the JPEG code works, we suggest reading one or +more of the REFERENCES, then looking at the documentation files (in roughly +the order listed) before diving into the code. + + +OVERVIEW +======== + +This package contains C software to implement JPEG image compression and +decompression. JPEG (pronounced "jay-peg") is a standardized compression +method for full-color and gray-scale images. JPEG is intended for compressing +"real-world" scenes; line drawings, cartoons and other non-realistic images +are not its strong suit. JPEG is lossy, meaning that the output image is not +exactly identical to the input image. Hence you must not use JPEG if you +have to have identical output bits. However, on typical photographic images, +very good compression levels can be obtained with no visible change, and +remarkably high compression levels are possible if you can tolerate a +low-quality image. For more details, see the references, or just experiment +with various compression settings. + +This software implements JPEG baseline, extended-sequential, and progressive +compression processes. Provision is made for supporting all variants of these +processes, although some uncommon parameter settings aren't implemented yet. +For legal reasons, we are not distributing code for the arithmetic-coding +variants of JPEG; see LEGAL ISSUES. We have made no provision for supporting +the hierarchical or lossless processes defined in the standard. + +We provide a set of library routines for reading and writing JPEG image files, +plus two sample applications "cjpeg" and "djpeg", which use the library to +perform conversion between JPEG and some other popular image file formats. +The library is intended to be reused in other applications. + +In order to support file conversion and viewing software, we have included +considerable functionality beyond the bare JPEG coding/decoding capability; +for example, the color quantization modules are not strictly part of JPEG +decoding, but they are essential for output to colormapped file formats or +colormapped displays. These extra functions can be compiled out of the +library if not required for a particular application. We have also included +"jpegtran", a utility for lossless transcoding between different JPEG +processes, and "rdjpgcom" and "wrjpgcom", two simple applications for +inserting and extracting textual comments in JFIF files. + +The emphasis in designing this software has been on achieving portability and +flexibility, while also making it fast enough to be useful. In particular, +the software is not intended to be read as a tutorial on JPEG. (See the +REFERENCES section for introductory material.) Rather, it is intended to +be reliable, portable, industrial-strength code. We do not claim to have +achieved that goal in every aspect of the software, but we strive for it. + +We welcome the use of this software as a component of commercial products. +No royalty is required, but we do ask for an acknowledgement in product +documentation, as described under LEGAL ISSUES. + + +LEGAL ISSUES +============ + +In plain English: + +1. We don't promise that this software works. (But if you find any bugs, + please let us know!) +2. You can use this software for whatever you want. You don't have to pay us. +3. You may not pretend that you wrote this software. If you use it in a + program, you must acknowledge somewhere in your documentation that + you've used the IJG code. + +In legalese: + +The authors make NO WARRANTY or representation, either express or implied, +with respect to this software, its quality, accuracy, merchantability, or +fitness for a particular purpose. This software is provided "AS IS", and you, +its user, assume the entire risk as to its quality and accuracy. + +This software is copyright (C) 1991-1996, Thomas G. Lane. +All Rights Reserved except as specified below. + +Permission is hereby granted to use, copy, modify, and distribute this +software (or portions thereof) for any purpose, without fee, subject to these +conditions: +(1) If any part of the source code for this software is distributed, then this +README file must be included, with this copyright and no-warranty notice +unaltered; and any additions, deletions, or changes to the original files +must be clearly indicated in accompanying documentation. +(2) If only executable code is distributed, then the accompanying +documentation must state that "this software is based in part on the work of +the Independent JPEG Group". +(3) Permission for use of this software is granted only if the user accepts +full responsibility for any undesirable consequences; the authors accept +NO LIABILITY for damages of any kind. + +These conditions apply to any software derived from or based on the IJG code, +not just to the unmodified library. If you use our work, you ought to +acknowledge us. + +Permission is NOT granted for the use of any IJG author's name or company name +in advertising or publicity relating to this software or products derived from +it. This software may be referred to only as "the Independent JPEG Group's +software". + +We specifically permit and encourage the use of this software as the basis of +commercial products, provided that all warranty or liability claims are +assumed by the product vendor. + + +ansi2knr.c is included in this distribution by permission of L. Peter Deutsch, +sole proprietor of its copyright holder, Aladdin Enterprises of Menlo Park, CA. +ansi2knr.c is NOT covered by the above copyright and conditions, but instead +by the usual distribution terms of the Free Software Foundation; principally, +that you must include source code if you redistribute it. (See the file +ansi2knr.c for full details.) However, since ansi2knr.c is not needed as part +of any program generated from the IJG code, this does not limit you more than +the foregoing paragraphs do. + +The configuration script "configure" was produced with GNU Autoconf. It +is copyright by the Free Software Foundation but is freely distributable. + +It appears that the arithmetic coding option of the JPEG spec is covered by +patents owned by IBM, AT&T, and Mitsubishi. Hence arithmetic coding cannot +legally be used without obtaining one or more licenses. For this reason, +support for arithmetic coding has been removed from the free JPEG software. +(Since arithmetic coding provides only a marginal gain over the unpatented +Huffman mode, it is unlikely that very many implementations will support it.) +So far as we are aware, there are no patent restrictions on the remaining +code. + +WARNING: Unisys has begun to enforce their patent on LZW compression against +GIF encoders and decoders. You will need a license from Unisys to use the +included rdgif.c or wrgif.c files in a commercial or shareware application. +At this time, Unisys is not enforcing their patent against freeware, so +distribution of this package remains legal. However, we intend to remove +GIF support from the IJG package as soon as a suitable replacement format +becomes reasonably popular. + +We are required to state that + "The Graphics Interchange Format(c) is the Copyright property of + CompuServe Incorporated. GIF(sm) is a Service Mark property of + CompuServe Incorporated." + + +REFERENCES +========== + +We highly recommend reading one or more of these references before trying to +understand the innards of the JPEG software. + +The best short technical introduction to the JPEG compression algorithm is + Wallace, Gregory K. "The JPEG Still Picture Compression Standard", + Communications of the ACM, April 1991 (vol. 34 no. 4), pp. 30-44. +(Adjacent articles in that issue discuss MPEG motion picture compression, +applications of JPEG, and related topics.) If you don't have the CACM issue +handy, a PostScript file containing a revised version of Wallace's article +is available at ftp.uu.net, graphics/jpeg/wallace.ps.gz. The file (actually +a preprint for an article that appeared in IEEE Trans. Consumer Electronics) +omits the sample images that appeared in CACM, but it includes corrections +and some added material. Note: the Wallace article is copyright ACM and +IEEE, and it may not be used for commercial purposes. + +A somewhat less technical, more leisurely introduction to JPEG can be found in +"The Data Compression Book" by Mark Nelson, published by M&T Books (Redwood +City, CA), 1991, ISBN 1-55851-216-0. This book provides good explanations and +example C code for a multitude of compression methods including JPEG. It is +an excellent source if you are comfortable reading C code but don't know much +about data compression in general. The book's JPEG sample code is far from +industrial-strength, but when you are ready to look at a full implementation, +you've got one here... + +The best full description of JPEG is the textbook "JPEG Still Image Data +Compression Standard" by William B. Pennebaker and Joan L. Mitchell, published +by Van Nostrand Reinhold, 1993, ISBN 0-442-01272-1. Price US$59.95, 638 pp. +The book includes the complete text of the ISO JPEG standards (DIS 10918-1 +and draft DIS 10918-2). This is by far the most complete exposition of JPEG +in existence, and we highly recommend it. + +The JPEG standard itself is not available electronically; you must order a +paper copy through ISO or ITU. (Unless you feel a need to own a certified +official copy, we recommend buying the Pennebaker and Mitchell book instead; +it's much cheaper and includes a great deal of useful explanatory material.) +In the USA, copies of the standard may be ordered from ANSI Sales at (212) +642-4900, or from Global Engineering Documents at (800) 854-7179. (ANSI +doesn't take credit card orders, but Global does.) It's not cheap: as of +1992, ANSI was charging $95 for Part 1 and $47 for Part 2, plus 7% +shipping/handling. The standard is divided into two parts, Part 1 being the +actual specification, while Part 2 covers compliance testing methods. Part 1 +is titled "Digital Compression and Coding of Continuous-tone Still Images, +Part 1: Requirements and guidelines" and has document numbers ISO/IEC IS +10918-1, ITU-T T.81. Part 2 is titled "Digital Compression and Coding of +Continuous-tone Still Images, Part 2: Compliance testing" and has document +numbers ISO/IEC IS 10918-2, ITU-T T.83. + +Extensions to the original JPEG standard are defined in JPEG Part 3, a new ISO +document. Part 3 is undergoing ISO balloting and is expected to be approved +by the end of 1995; it will have document numbers ISO/IEC IS 10918-3, ITU-T +T.84. IJG currently does not support any Part 3 extensions. + +The JPEG standard does not specify all details of an interchangeable file +format. For the omitted details we follow the "JFIF" conventions, revision +1.02. A copy of the JFIF spec is available from: + Literature Department + C-Cube Microsystems, Inc. + 1778 McCarthy Blvd. + Milpitas, CA 95035 + phone (408) 944-6300, fax (408) 944-6314 +A PostScript version of this document is available at ftp.uu.net, file +graphics/jpeg/jfif.ps.gz. It can also be obtained by e-mail from the C-Cube +mail server, netlib@c3.pla.ca.us. Send the message "send jfif_ps from jpeg" +to the server to obtain the JFIF document; send the message "help" if you have +trouble. + +The TIFF 6.0 file format specification can be obtained by FTP from sgi.com +(192.48.153.1), file graphics/tiff/TIFF6.ps.Z; or you can order a printed +copy from Aldus Corp. at (206) 628-6593. The JPEG incorporation scheme +found in the TIFF 6.0 spec of 3-June-92 has a number of serious problems. +IJG does not recommend use of the TIFF 6.0 design (TIFF Compression tag 6). +Instead, we recommend the JPEG design proposed by TIFF Technical Note #2 +(Compression tag 7). Copies of this Note can be obtained from sgi.com or +from ftp.uu.net:/graphics/jpeg/. It is expected that the next revision of +the TIFF spec will replace the 6.0 JPEG design with the Note's design. +Although IJG's own code does not support TIFF/JPEG, the free libtiff library +uses our library to implement TIFF/JPEG per the Note. libtiff is available +from sgi.com:/graphics/tiff/. + + +ARCHIVE LOCATIONS +================= + +The "official" archive site for this software is ftp.uu.net (Internet +address 192.48.96.9). The most recent released version can always be found +there in directory graphics/jpeg. This particular version will be archived +as graphics/jpeg/jpegsrc.v6a.tar.gz. If you are on the Internet, you +can retrieve files from ftp.uu.net by standard anonymous FTP. If you don't +have FTP access, UUNET's archives are also available via UUCP; contact +help@uunet.uu.net for information on retrieving files that way. + +Numerous Internet sites maintain copies of the UUNET files. However, only +ftp.uu.net is guaranteed to have the latest official version. + +You can also obtain this software in DOS-compatible "zip" archive format from +the SimTel archives (ftp.coast.net:/SimTel/msdos/graphics/), or on CompuServe +in the Graphics Support forum (GO CIS:GRAPHSUP), library 12 "JPEG Tools". +Again, these versions may sometimes lag behind the ftp.uu.net release. + +The JPEG FAQ (Frequently Asked Questions) article is a useful source of +general information about JPEG. It is updated constantly and therefore is +not included in this distribution. The FAQ is posted every two weeks to +Usenet newsgroups comp.graphics.misc, news.answers, and other groups. +You can always obtain the latest version from the news.answers archive at +rtfm.mit.edu. By FTP, fetch /pub/usenet/news.answers/jpeg-faq/part1 and +.../part2. If you don't have FTP, send e-mail to mail-server@rtfm.mit.edu +with body + send usenet/news.answers/jpeg-faq/part1 + send usenet/news.answers/jpeg-faq/part2 + + +RELATED SOFTWARE +================ + +Numerous viewing and image manipulation programs now support JPEG. (Quite a +few of them use this library to do so.) The JPEG FAQ described above lists +some of the more popular free and shareware viewers, and tells where to +obtain them on Internet. + +If you are on a Unix machine, we highly recommend Jef Poskanzer's free +PBMPLUS image software, which provides many useful operations on PPM-format +image files. In particular, it can convert PPM images to and from a wide +range of other formats. You can obtain this package by FTP from ftp.x.org +(contrib/pbmplus*.tar.Z) or ftp.ee.lbl.gov (pbmplus*.tar.Z). There is also +a newer update of this package called NETPBM, available from +wuarchive.wustl.edu under directory /graphics/graphics/packages/NetPBM/. +Unfortunately PBMPLUS/NETPBM is not nearly as portable as the IJG software +is; you are likely to have difficulty making it work on any non-Unix machine. + +A different free JPEG implementation, written by the PVRG group at Stanford, +is available from havefun.stanford.edu in directory pub/jpeg. This program +is designed for research and experimentation rather than production use; +it is slower, harder to use, and less portable than the IJG code, but it +is easier to read and modify. Also, the PVRG code supports lossless JPEG, +which we do not. + + +FILE FORMAT WARS +================ + +Some JPEG programs produce files that are not compatible with our library. +The root of the problem is that the ISO JPEG committee failed to specify a +concrete file format. Some vendors "filled in the blanks" on their own, +creating proprietary formats that no one else could read. (For example, none +of the early commercial JPEG implementations for the Macintosh were able to +exchange compressed files.) + +The file format we have adopted is called JFIF (see REFERENCES). This format +has been agreed to by a number of major commercial JPEG vendors, and it has +become the de facto standard. JFIF is a minimal or "low end" representation. +We recommend the use of TIFF/JPEG (TIFF revision 6.0 as modified by TIFF +Technical Note #2) for "high end" applications that need to record a lot of +additional data about an image. TIFF/JPEG is fairly new and not yet widely +supported, unfortunately. + +The upcoming JPEG Part 3 standard defines a file format called SPIFF. +SPIFF is interoperable with JFIF, in the sense that most JFIF decoders should +be able to read the most common variant of SPIFF. SPIFF has some technical +advantages over JFIF, but its major claim to fame is simply that it is an +official standard rather than an informal one. At this point it is unclear +whether SPIFF will supersede JFIF or whether JFIF will remain the de-facto +standard. IJG intends to support SPIFF once the standard is frozen, but we +have not decided whether it should become our default output format or not. +(In any case, our decoder will remain capable of reading JFIF indefinitely.) + +Various proprietary file formats incorporating JPEG compression also exist. +We have little or no sympathy for the existence of these formats. Indeed, +one of the original reasons for developing this free software was to help +force convergence on common, open format standards for JPEG files. Don't +use a proprietary file format! + + +TO DO +===== + +In future versions, we are considering supporting some of the upcoming JPEG +Part 3 extensions --- principally, variable quantization and the SPIFF file +format. + +Tuning the software for better behavior at low quality/high compression +settings is also of interest. The current method for scaling the +quantization tables is known not to be very good at low Q values. + +As always, speeding things up is high on our priority list. + +Please send bug reports, offers of help, etc. to jpeg-info@uunet.uu.net. diff --git a/baseline/source/cjpeg_wrbmp/cderror.h b/baseline/source/cjpeg_wrbmp/cderror.h new file mode 100644 index 0000000..e479834 --- /dev/null +++ b/baseline/source/cjpeg_wrbmp/cderror.h @@ -0,0 +1,140 @@ + +/* + + This program is part of the TACLeBench benchmark suite. + Version V 1.x + + Name: cderror.h + + Author: 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. + + This file defines the error and message codes for the cjpeg/djpeg + applications. These strings are not needed as part of the JPEG library + proper. + Edit this file to add new codes, or to translate the message strings to + some other language. + + Source: Independent JPEG Group's software + + Changes: no major functional changes + + License: See the accompanying README file + + */ + +#ifndef CJPEG_WRBMP_JMESSAGE +#ifndef CDERROR_H +#define CDERROR_H +/*First time through, define the enum list*/ +#define CJPEG_WRBMP_JMAKE_ENUM_LIST +#else +/* Repeated inclusions of this file are no-ops unless JMESSAGE is defined*/ +#define CJPEG_WRBMP_JMESSAGE(code,string) +#endif +#endif + +#ifdef CJPEG_WRBMP_JMAKE_ENUM_LIST + +typedef enum { + +#define CJPEG_WRBMP_JMESSAGE(code,string) code , + +#endif + + CJPEG_WRBMP_JMESSAGE( JMSG_FIRSTADDONCODE = 1000, NULL ) //Must be first entry! + + #ifdef CJPEG_WRBMP_BMP_SUPPORTED + CJPEG_WRBMP_JMESSAGE( JERR_BMP_BADCMAP, "Unsupported BMP colormap format" ) + CJPEG_WRBMP_JMESSAGE( JERR_BMP_BADDEPTH, "Only 8- and 24-bit BMP files are supported" ) + CJPEG_WRBMP_JMESSAGE( JERR_BMP_BADHEADER, "Invalid BMP file: bad header length" ) + CJPEG_WRBMP_JMESSAGE( JERR_BMP_BADPLANES, "Invalid BMP file: biPlanes not equal to 1" ) + CJPEG_WRBMP_JMESSAGE( JERR_BMP_COLORSPACE, "BMP output must be grayscale or RGB" ) + CJPEG_WRBMP_JMESSAGE( JERR_BMP_COMPRESSED, "Sorry, compressed BMPs not yet supported" ) + CJPEG_WRBMP_JMESSAGE( JERR_BMP_NOT, "Not a BMP file - does not start with BM" ) + CJPEG_WRBMP_JMESSAGE( JTRC_BMP, "%ux%u 24-bit BMP image" ) + CJPEG_WRBMP_JMESSAGE( JTRC_BMP_MAPPED, "%ux%u 8-bit colormapped BMP image" ) + CJPEG_WRBMP_JMESSAGE( JTRC_BMP_OS2, "%ux%u 24-bit OS2 BMP image" ) + CJPEG_WRBMP_JMESSAGE( JTRC_BMP_OS2_MAPPED, "%ux%u 8-bit colormapped OS2 BMP image" ) + #endif + + #ifdef CJPEG_WRBMP_GIF_SUPPORTED + CJPEG_WRBMP_JMESSAGE( JERR_GIF_BUG, "GIF output got confused" ) + CJPEG_WRBMP_JMESSAGE( JERR_GIF_CODESIZE, "Bogus GIF codesize %d" ) + CJPEG_WRBMP_JMESSAGE( JERR_GIF_COLORSPACE, "GIF output must be grayscale or RGB" ) + CJPEG_WRBMP_JMESSAGE( JERR_GIF_IMAGENOTFOUND, "Too few images in GIF file" ) + CJPEG_WRBMP_JMESSAGE( JERR_GIF_NOT, "Not a GIF file" ) + CJPEG_WRBMP_JMESSAGE( JTRC_GIF, "%ux%ux%d GIF image" ) + CJPEG_WRBMP_JMESSAGE( JTRC_GIF_BADVERSION, + "Warning: unexpected GIF version number '%c%c%c'" ) + CJPEG_WRBMP_JMESSAGE( JTRC_GIF_EXTENSION, "Ignoring GIF extension block of type 0x%02x" ) + CJPEG_WRBMP_JMESSAGE( JTRC_GIF_NONSQUARE, "Caution: nonsquare pixels in input" ) + CJPEG_WRBMP_JMESSAGE( JWRN_GIF_BADDATA, "Corrupt data in GIF file" ) + CJPEG_WRBMP_JMESSAGE( JWRN_GIF_CHAR, "Bogus char 0x%02x in GIF file, ignoring" ) + CJPEG_WRBMP_JMESSAGE( JWRN_GIF_ENDCODE, "Premature end of GIF image" ) + CJPEG_WRBMP_JMESSAGE( JWRN_GIF_NOMOREDATA, "Ran out of GIF bits" ) + #endif + + #ifdef CJPEG_WRBMP_PPM_SUPPORTED + CJPEG_WRBMP_JMESSAGE( JERR_PPM_COLORSPACE, "PPM output must be grayscale or RGB" ) + CJPEG_WRBMP_JMESSAGE( JERR_PPM_NONNUMERIC, "Nonnumeric data in PPM file" ) + CJPEG_WRBMP_JMESSAGE( JERR_PPM_NOT, "Not a PPM/PGM file" ) + CJPEG_WRBMP_JMESSAGE( JTRC_PGM, "%ux%u PGM image" ) + CJPEG_WRBMP_JMESSAGE( JTRC_PGM_TEXT, "%ux%u text PGM image" ) + CJPEG_WRBMP_JMESSAGE( JTRC_PPM, "%ux%u PPM image" ) + CJPEG_WRBMP_JMESSAGE( JTRC_PPM_TEXT, "%ux%u text PPM image" ) + #endif + + #ifdef RLE_SUPPORTED + CJPEG_WRBMP_JMESSAGE( JERR_RLE_BADERROR, "Bogus error code from RLE library" ) + CJPEG_WRBMP_JMESSAGE( JERR_RLE_COLORSPACE, "RLE output must be grayscale or RGB" ) + CJPEG_WRBMP_JMESSAGE( JERR_RLE_DIMENSIONS, "Image dimensions (%ux%u) too large for RLE" ) + CJPEG_WRBMP_JMESSAGE( JERR_RLE_EMPTY, "Empty RLE file" ) + CJPEG_WRBMP_JMESSAGE( JERR_RLE_EOF, "Premature EOF in RLE header" ) + CJPEG_WRBMP_JMESSAGE( JERR_RLE_MEM, "Insufficient memory for RLE header" ) + CJPEG_WRBMP_JMESSAGE( JERR_RLE_NOT, "Not an RLE file" ) + CJPEG_WRBMP_JMESSAGE( JERR_RLE_TOOMANYCHANNELS, "Cannot handle %d output channels for RLE" ) + CJPEG_WRBMP_JMESSAGE( JERR_RLE_UNSUPPORTED, "Cannot handle this RLE setup" ) + CJPEG_WRBMP_JMESSAGE( JTRC_RLE, "%ux%u full-color RLE file" ) + CJPEG_WRBMP_JMESSAGE( JTRC_RLE_FULLMAP, "%ux%u full-color RLE file with map of length %d" ) + CJPEG_WRBMP_JMESSAGE( JTRC_RLE_GRAY, "%ux%u grayscale RLE file" ) + CJPEG_WRBMP_JMESSAGE( JTRC_RLE_MAPGRAY, "%ux%u grayscale RLE file with map of length %d" ) + CJPEG_WRBMP_JMESSAGE( JTRC_RLE_MAPPED, "%ux%u colormapped RLE file with map of length %d" ) + #endif + + #ifdef CJPEG_WRBMP_TARGA_SUPPORTED + CJPEG_WRBMP_JMESSAGE( JERR_TGA_BADCMAP, "Unsupported Targa colormap format" ) + CJPEG_WRBMP_JMESSAGE( JERR_TGA_BADPARMS, "Invalid or unsupported Targa file" ) + CJPEG_WRBMP_JMESSAGE( JERR_TGA_COLORSPACE, "Targa output must be grayscale or RGB" ) + CJPEG_WRBMP_JMESSAGE( JTRC_TGA, "%ux%u RGB Targa image" ) + CJPEG_WRBMP_JMESSAGE( JTRC_TGA_GRAY, "%ux%u grayscale Targa image" ) + CJPEG_WRBMP_JMESSAGE( JTRC_TGA_MAPPED, "%ux%u colormapped Targa image" ) + #else + CJPEG_WRBMP_JMESSAGE( JERR_TGA_NOTCOMP, "Targa support was not compiled" ) + #endif + + CJPEG_WRBMP_JMESSAGE( JERR_BAD_CMAP_FILE, + "Color map file is invalid or of unsupported format" ) + CJPEG_WRBMP_JMESSAGE( JERR_TOO_MANY_COLORS, + "Output file format cannot handle %d colormap entries" ) + CJPEG_WRBMP_JMESSAGE( JERR_UNGETC_FAILED, "ungetc failed" ) + #ifdef CJPEG_WRBMP_TARGA_SUPPORTED + CJPEG_WRBMP_JMESSAGE( JERR_UNKNOWN_FORMAT, + "Unrecognized input file format --- perhaps you need -targa" ) + #else + CJPEG_WRBMP_JMESSAGE( JERR_UNKNOWN_FORMAT, "Unrecognized input file format" ) + #endif + CJPEG_WRBMP_JMESSAGE( JERR_UNSUPPORTED_FORMAT, "Unsupported output file format" ) + + #ifdef CJPEG_WRBMP_JMAKE_ENUM_LIST + + JMSG_LASTADDONCODE +} CJPEG_WRBMP_ADDON_MESSAGE_CODE; + +#undef CJPEG_WRBMP_JMAKE_ENUM_LIST + #endif + +/* Zap JMESSAGE macro so that future re-inclusions do nothing by default*/ +#undef CJPEG_WRBMP_JMESSAGE diff --git a/baseline/source/cjpeg_wrbmp/cdjpeg.h b/baseline/source/cjpeg_wrbmp/cdjpeg.h new file mode 100644 index 0000000..6c3fc7b --- /dev/null +++ b/baseline/source/cjpeg_wrbmp/cdjpeg.h @@ -0,0 +1,105 @@ +/* + + This program is part of the TACLeBench benchmark suite. + Version V 1.x + + Name: cdjpeg.h + + Author: 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. + + This file contains common declarations for the sample applications + cjpeg and djpeg. It is NOT used by the core JPEG library. + + Source: Independent JPEG Group's software + + Changes: no major functional changes + + License: See the accompanying README file + +*/ +#ifndef CDJPEG_H +#define CDJPEG_H + +#define CJPEG_WRBMP_JPEG_CJPEG_DJPEG /* define proper options in jconfig.h */ +#define CJPEG_WRBMP_JPEG_INTERNAL_OPTIONS /* cjpeg.c,djpeg.c need to see xxx_SUPPORTED */ + +#include "jpeglib.h" +#include "jerror.h" /* get library error codes too */ +#include "cderror.h" /* get application-specific error codes */ + +typedef struct cjpeg_wrbmp_cjpeg_source_struct + *cjpeg_wrbmp_cjpeg_source_ptr; + +struct cjpeg_wrbmp_cjpeg_source_struct { + CJPEG_WRBMP_JMETHOD( void, start_input, + ( cjpeg_wrbmp_j_compress_ptr cinfo, + cjpeg_wrbmp_cjpeg_source_ptr sinfo ) ); + CJPEG_WRBMP_JMETHOD( CJPEG_WRBMP_JDIMENSION, get_pixel_rows, + ( cjpeg_wrbmp_j_compress_ptr cinfo, + cjpeg_wrbmp_cjpeg_source_ptr sinfo ) ); + CJPEG_WRBMP_JMETHOD( void, finish_input, + ( cjpeg_wrbmp_j_compress_ptr cinfo, + cjpeg_wrbmp_cjpeg_source_ptr sinfo ) ); + + CJPEG_WRBMP_FILE *input_file; + + CJPEG_WRBMP_JSAMPARRAY buffer; + CJPEG_WRBMP_JDIMENSION buffer_height; +}; + + +typedef struct cjpeg_wrbmp_djpeg_dest_struct + *cjpeg_wrbmp_djpeg_dest_ptr; + +struct cjpeg_wrbmp_djpeg_dest_struct { + CJPEG_WRBMP_JMETHOD( void, start_output, + ( cjpeg_wrbmp_j_decompress_ptr cinfo, + cjpeg_wrbmp_djpeg_dest_ptr dinfo ) ); + /* Emit the specified number of pixel rows from the buffer. */ + CJPEG_WRBMP_JMETHOD( void, put_pixel_rows, + ( cjpeg_wrbmp_j_decompress_ptr cinfo, + cjpeg_wrbmp_djpeg_dest_ptr dinfo, + CJPEG_WRBMP_JDIMENSION rows_supplied ) ); + /* Finish up at the end of the image. */ + CJPEG_WRBMP_JMETHOD( void, finish_output, + ( cjpeg_wrbmp_j_decompress_ptr cinfo, + cjpeg_wrbmp_djpeg_dest_ptr dinfo ) ); + + /* Target file spec; filled in by djpeg.c after object is created. */ + CJPEG_WRBMP_FILE *output_file; + + /* Output pixel-row buffer. Created by module init or start_output. + Width is cinfo->output_width * cinfo->output_components; + height is buffer_height. + */ + CJPEG_WRBMP_JSAMPARRAY buffer; + CJPEG_WRBMP_JDIMENSION buffer_height; +} ; + + + +/* + cjpeg/djpeg may need to perform extra passes to convert to or from + the source/destination file format. The JPEG library does not know + about these passes, but we'd like them to be counted by the progress + monitor. We use an expanded progress monitor object to hold the + additional pass count. +*/ + +struct cjpeg_wrbmp_cdjpeg_progress_mgr { + struct cjpeg_wrbmp_jpeg_progress_mgr + pub; /* fields known to JPEG library */ + int completed_extra_passes; /* extra passes completed */ + int total_extra_passes; /* total extra */ + /* last printed percentage stored here to avoid multiple printouts */ + int percent_done; +}; + +typedef struct cjpeg_wrbmp_cdjpeg_progress_mgr + *cjpeg_wrbmp_cd_progress_ptr; + +#endif + diff --git a/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c new file mode 100644 index 0000000..7bef7ab --- /dev/null +++ b/baseline/source/cjpeg_wrbmp/cjpeg_wrbmp.c @@ -0,0 +1,225 @@ +/* + + This program is part of the TACLeBench benchmark suite. + Version V 1.x + + Name: cjpeg_jpeg6b_wrbmp.c + + Author: Thomas G. Lane. + + Function: This file contains routines to write output images in Microsoft "BMP" + format (MS Windows 3.x and OS/2 1.x flavors). + Either 8-bit colormapped or 24-bit full-color format can be written. + No compression is supported. + + These routines may need modification for non-Unix environments or + specialized applications. As they stand, they assume output to + an ordinary stdio stream. + + Source: Independent JPEG Group's software + + Changes: a brief summary of major functional changes (not formatting) + + License: See the accompanying README file + +*/ + +#include "../extra.h" +#include "cdjpeg.h" + +#ifdef CJPEG_WRBMP_BMP_SUPPORTED + +/* + Declaration of global variables +*/ +typedef struct { + struct cjpeg_wrbmp_djpeg_dest_struct pub; /* public fields */ + cjpeg_wrbmp_boolean is_os2; /* saves the OS2 format request flag */ + cjpeg_wrbmp_jvirt_sarray_ptr + whole_image; /* needed to reverse row order */ + CJPEG_WRBMP_JDIMENSION data_width; /* JSAMPLEs per row */ + CJPEG_WRBMP_JDIMENSION + row_width; /* physical width of one row in the BMP file */ + int pad_bytes; /* number of padding bytes needed per row */ + CJPEG_WRBMP_JDIMENSION + cur_output_row; /* next row# to write to virtual array */ +} cjpeg_wrbmp_bmp_dest_struct; + +typedef cjpeg_wrbmp_bmp_dest_struct *cjpeg_wrbmp_bmp_dest_ptr; +extern unsigned char cjpeg_wrbmp_colormap[3][256]; +unsigned char cjpeg_wrbmp_output_array[6144]; +unsigned char *cjpeg_wrbmp_jpeg_stream /*= cjpeg_jpeg6b_wrbmp_output_array*/; +int cjpeg_wrbmp_checksum; + +struct cjpeg_wrbmp_jpeg_decompress_struct + cjpeg_wrbmp_jpeg_dec_1; +struct cjpeg_wrbmp_jpeg_decompress_struct + cjpeg_wrbmp_jpeg_dec_2; +struct cjpeg_wrbmp_djpeg_dest_struct + cjpeg_wrbmp_djpeg_dest; +cjpeg_wrbmp_bmp_dest_struct cjpeg_wrbmp_bmp_dest; + +/* + Forward declaration of functions +*/ +void cjpeg_wrbmp_initInput( void ); +void cjpeg_wrbmp_finish_output_bmp( cjpeg_wrbmp_j_decompress_ptr cinfo); +void cjpeg_wrbmp_write_colormap( cjpeg_wrbmp_j_decompress_ptr + cinfo, + int map_colors, int map_entry_size, + int cMap ); +int cjpeg_wrbmp_putc_modified( int character ); +void cjpeg_wrbmp_init(); +void cjpeg_wrbmp_main(); +int cjpeg_wrbmp_return(); +//int main(); + +/* + Initialization functions +*/ +void cjpeg_wrbmp_init() +{ + cjpeg_wrbmp_initInput(); + + cjpeg_wrbmp_jpeg_dec_1.progress = 0; + cjpeg_wrbmp_jpeg_dec_1.output_height = 30; + cjpeg_wrbmp_jpeg_dec_1.actual_number_of_colors = 256; + cjpeg_wrbmp_jpeg_dec_1.out_color_components = 2; + + cjpeg_wrbmp_jpeg_dec_2.progress = 0; + cjpeg_wrbmp_jpeg_dec_2.output_height = 30; + cjpeg_wrbmp_jpeg_dec_2.actual_number_of_colors = 256; + cjpeg_wrbmp_jpeg_dec_2.out_color_components = 3; + + cjpeg_wrbmp_jpeg_stream = cjpeg_wrbmp_output_array; + + cjpeg_wrbmp_checksum = 0; +} + +/* + Calculation functions +*/ +int cjpeg_wrbmp_putc_modified( int character ) +{ + *( cjpeg_wrbmp_jpeg_stream ) = character; + + ++cjpeg_wrbmp_jpeg_stream; + + cjpeg_wrbmp_checksum += character; + + return character; +} + +void cjpeg_wrbmp_finish_output_bmp( cjpeg_wrbmp_j_decompress_ptr cinfo ) +{ + CJPEG_WRBMP_JDIMENSION row; + cjpeg_wrbmp_cd_progress_ptr progress = + ( cjpeg_wrbmp_cd_progress_ptr ) cinfo->progress; + + // Write the file body from our virtual array + _Pragma( "loopbound min 30 max 30" ) + for ( row = cinfo->output_height; row > 0; --row ) { + if ( progress != 0 ) { + progress->pub.pass_counter = ( long )( cinfo->output_height - row ); + progress->pub.pass_limit = ( long ) cinfo->output_height; + } + } + + if ( progress != 0 ) + progress->completed_extra_passes++; + } + +void cjpeg_wrbmp_write_colormap( cjpeg_wrbmp_j_decompress_ptr + cinfo, + int map_colors, int map_entry_size, int cMap ) +{ + + int num_colors = cinfo->actual_number_of_colors; + int i; + + if ( cMap != 0 ) { + + if ( cinfo->out_color_components == 3 ) { + // Normal case with RGB colormap + _Pragma( "loopbound min 256 max 256" ) + for ( i = 0; i < num_colors; i++ ) { + cjpeg_wrbmp_putc_modified( CJPEG_WRBMP_GETJSAMPLE( + cjpeg_wrbmp_colormap[2][i] ) ); + cjpeg_wrbmp_putc_modified( CJPEG_WRBMP_GETJSAMPLE( + cjpeg_wrbmp_colormap[1][i] ) ); + cjpeg_wrbmp_putc_modified( CJPEG_WRBMP_GETJSAMPLE( + cjpeg_wrbmp_colormap[0][i] ) ); + + if ( map_entry_size == 4 ) + cjpeg_wrbmp_putc_modified( 0 ); + } + } else { + // Grayscale colormap (only happens with grayscale quantization) + _Pragma( "loopbound min 256 max 256" ) + for ( i = 0; i < num_colors; i++ ) { + + cjpeg_wrbmp_putc_modified( CJPEG_WRBMP_GETJSAMPLE( + cjpeg_wrbmp_colormap[2][i] ) ); + cjpeg_wrbmp_putc_modified( CJPEG_WRBMP_GETJSAMPLE( + cjpeg_wrbmp_colormap[1][i] ) ); + cjpeg_wrbmp_putc_modified( CJPEG_WRBMP_GETJSAMPLE( + cjpeg_wrbmp_colormap[0][i] ) ); + + if ( map_entry_size == 4 ) + cjpeg_wrbmp_putc_modified( 0 ); + } + } + } else { + // If no colormap, must be grayscale data. Generate a linear "map". + _Pragma( "loopbound min 256 max 256" ) + for ( i = 0; i < 256; i++ ) { + cjpeg_wrbmp_putc_modified( i ); + cjpeg_wrbmp_putc_modified( i ); + cjpeg_wrbmp_putc_modified( i ); + + if ( map_entry_size == 4 ) + cjpeg_wrbmp_putc_modified( 0 ); + } + } + + // Pad colormap with zeros to ensure specified number of colormap entries. + _Pragma( "loopbound min 512 max 512" ) + for ( ; i < map_colors; i++ ) { + cjpeg_wrbmp_putc_modified( 0 ); + cjpeg_wrbmp_putc_modified( 0 ); + cjpeg_wrbmp_putc_modified( 0 ); + + if ( map_entry_size == 4 ) + cjpeg_wrbmp_putc_modified( 0 ); + } +} + +void _Pragma( "entrypoint" ) cjpeg_wrbmp_main() +{ + cjpeg_wrbmp_finish_output_bmp( &cjpeg_wrbmp_jpeg_dec_1); + cjpeg_wrbmp_write_colormap( &cjpeg_wrbmp_jpeg_dec_1, 768, 4, 1 ); + + cjpeg_wrbmp_finish_output_bmp( &cjpeg_wrbmp_jpeg_dec_2 ); + cjpeg_wrbmp_write_colormap( &cjpeg_wrbmp_jpeg_dec_2, 768, 4, 1 ); +} + +int cjpeg_wrbmp_return() +{ + return (cjpeg_wrbmp_checksum + (-209330) ) != 0; +} + +int main(int argc, char **argv) +{ + SET_UP + for (jobsComplete=-1; jobsComplete