Ignore:
Timestamp:
Jan 4, 2010, 8:20:18 PM (12 years ago)
Author:
rbri
Message:

JPEG plugin: libjpeg updated to version 7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/libjpeg/jmorecfg.h

    r15 r283  
    33 *
    44 * Copyright (C) 1991-1997, Thomas G. Lane.
     5 * Modified 1997-2009 by Guido Vollbeding.
    56 * This file is part of the Independent JPEG Group's software.
    67 * For conditions of distribution and use, see the accompanying README file.
     
    159160
    160161#ifndef XMD_H                   /* X11/xmd.h correctly defines INT32 */
     162#ifndef _BASETSD_H_             /* Microsoft defines it in basetsd.h */
     163#ifndef QGLOBAL_H               /* Qt defines it in qglobal.h */
    161164typedef long INT32;
     165#endif
     166#endif
    162167#endif
    163168
     
    210215 */
    211216
     217#ifndef FAR
    212218#ifdef NEED_FAR_POINTERS
    213219#define FAR  far
    214220#else
    215221#define FAR
     222#endif
    216223#endif
    217224
     
    225232
    226233#ifndef HAVE_BOOLEAN
    227 //typedef int boolean;
    228 typedef unsigned char boolean;
     234typedef int boolean;
    229235#endif
    230236#ifndef FALSE                   /* in case these macros already exist */
     
    258264 */
    259265
    260 /* Arithmetic coding is unsupported for legal reasons.  Complaints to IBM. */
    261 
    262266/* Capability options common to encoder and decoder: */
    263267
     
    268272/* Encoder capability options: */
    269273
    270 #undef C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
     274#define C_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
    271275#define C_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
    272276#define C_PROGRESSIVE_SUPPORTED     /* Progressive JPEG? (Requires MULTISCAN)*/
     277#define DCT_SCALING_SUPPORTED       /* Input rescaling via DCT? (Requires DCT_ISLOW)*/
    273278#define ENTROPY_OPT_SUPPORTED       /* Optimization of entropy coding parms? */
    274279/* Note: if you selected 12-bit data precision, it is dangerous to turn off
     
    284289/* Decoder capability options: */
    285290
    286 #undef D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
     291#define D_ARITH_CODING_SUPPORTED    /* Arithmetic coding back end? */
    287292#define D_MULTISCAN_FILES_SUPPORTED /* Multiple-scan JPEG files? */
    288293#define D_PROGRESSIVE_SUPPORTED     /* Progressive JPEG? (Requires MULTISCAN)*/
     294#define IDCT_SCALING_SUPPORTED      /* Output rescaling via IDCT? */
    289295#define SAVE_MARKERS_SUPPORTED      /* jpeg_save_markers() needed? */
    290296#define BLOCK_SMOOTHING_SUPPORTED   /* Block smoothing? (Progressive only) */
    291 #define IDCT_SCALING_SUPPORTED      /* Output rescaling via IDCT? */
    292297#undef  UPSAMPLE_SCALING_SUPPORTED  /* Output rescaling at upsample stage? */
    293298#define UPSAMPLE_MERGING_SUPPORTED  /* Fast path for sloppy upsampling? */
Note: See TracChangeset for help on using the changeset viewer.