5fae2503bf
This reverts commit f12204196fb1ee985ab9745cf9c70877601145f9. Campbell, sorry. have to revert this for the time being. We've missed some very important bits, such as: - FFmpeg is usually linked against OpenJPEG - OIIO needs OpenJPEG as well. For FFmpeg issues we can either disable OpenJPEG there (since we don't really use it), or bump FFmpeg to version 3.1.1 which can use either of OpenJPEG 1.5 or 2.1. For OIIO we do need OpenJPEG support (otherwise Cycles will not be able to use j2k/j2c textures) and currently there is NO solution to make OIIO working with OpenJPEG 2.1. According to Matthias Fauconneau (aka mfv) Larry is working on the patch to get OIIO work with OpenJPEG 2.1, but it'll take some time still. I've tried to look into support of some sort of build system flag and do ifdefs, but it all becomes quite nasty, especially with bundled OpenJPEG bumped to 2.1. Surely such an update is something we'll have to apply to but at this exact moment it causes quite some pain for all developers. Suggest to wait for until OIIO supports OpenJPEG 2.1 and then go with the updates for real.
140 lines
3.6 KiB
C
140 lines
3.6 KiB
C
/*
|
|
* Copyright (c) 2005, Herve Drolon, FreeImage Team
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS `AS IS'
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
* POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
#ifndef OPJ_INCLUDES_H
|
|
#define OPJ_INCLUDES_H
|
|
|
|
/*
|
|
==========================================================
|
|
Standard includes used by the library
|
|
==========================================================
|
|
*/
|
|
#include <memory.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <math.h>
|
|
#include <float.h>
|
|
#include <time.h>
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <ctype.h>
|
|
|
|
/*
|
|
==========================================================
|
|
OpenJPEG interface
|
|
==========================================================
|
|
*/
|
|
#include "openjpeg.h"
|
|
|
|
/*
|
|
==========================================================
|
|
OpenJPEG modules
|
|
==========================================================
|
|
*/
|
|
|
|
/* Ignore GCC attributes if this is not GCC */
|
|
#ifndef __GNUC__
|
|
#define __attribute__(x) /* __attribute__(x) */
|
|
#endif
|
|
|
|
/*
|
|
The inline keyword is supported by C99 but not by C90.
|
|
Most compilers implement their own version of this keyword ...
|
|
*/
|
|
#ifndef INLINE
|
|
#if defined(_MSC_VER)
|
|
#define INLINE __forceinline
|
|
#elif defined(__GNUC__)
|
|
#define INLINE __inline__
|
|
#elif defined(__MWERKS__)
|
|
#define INLINE inline
|
|
#else
|
|
/* add other compilers here ... */
|
|
#define INLINE
|
|
#endif /* defined(<Compiler>) */
|
|
#endif /* INLINE */
|
|
|
|
/* Are restricted pointers available? (C99) */
|
|
#if (__STDC_VERSION__ != 199901L)
|
|
/* Not a C99 compiler */
|
|
#ifdef __GNUC__
|
|
#define restrict __restrict__
|
|
#else
|
|
#define restrict /* restrict */
|
|
#endif
|
|
#endif
|
|
|
|
/* MSVC and Borland C do not have lrintf */
|
|
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
|
static INLINE long lrintf(float f){
|
|
#ifdef _M_IX86
|
|
long int i;
|
|
|
|
_asm{
|
|
fld f
|
|
fistp i
|
|
};
|
|
return i;
|
|
#else
|
|
return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
|
|
#endif /* _M_IX86 */
|
|
}
|
|
#endif
|
|
|
|
#include "j2k_lib.h"
|
|
#include "opj_malloc.h"
|
|
#include "event.h"
|
|
#include "bio.h"
|
|
#include "cio.h"
|
|
|
|
#include "image.h"
|
|
#include "j2k.h"
|
|
#include "jp2.h"
|
|
#include "jpt.h"
|
|
|
|
#include "mqc.h"
|
|
#include "raw.h"
|
|
#include "bio.h"
|
|
#include "tgt.h"
|
|
#include "pi.h"
|
|
#include "tcd.h"
|
|
#include "t1.h"
|
|
#include "dwt.h"
|
|
#include "t2.h"
|
|
#include "mct.h"
|
|
#include "int.h"
|
|
#include "fix.h"
|
|
|
|
#include "cidx_manager.h"
|
|
#include "indexbox_manager.h"
|
|
|
|
/* JPWL>> */
|
|
#ifdef USE_JPWL
|
|
#include "./jpwl/jpwl.h"
|
|
#endif /* USE_JPWL */
|
|
/* <<JPWL */
|
|
|
|
#endif /* OPJ_INCLUDES_H */
|