/*
* Copyright (c) 2005, Herve Drolon, FreeImage Team
+ * Copyright (c) 2008;2011-2012, Centre National d'Etudes Spatiales (CNES), France
+ * Copyright (c) 2012, CS Systemes d'Information, France
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* This must be included before any system headers,
* since they can react to macro defined there
*/
-#include "opj_config.h"
+#include "opj_config_private.h"
/*
==========================================================
ftello() only on systems with special LFS support since some systems
(e.g. FreeBSD) support a 64-bit off_t by default.
*/
-#if defined(HAVE_FSEEKO)
+#if !defined(OPENJPIP_H_) && defined(SERVER) /* server implementation uses fcgi/fseek*/
+#if defined(OPJ_HAVE_FSEEKO)
# define fseek fseeko
# define ftell ftello
#endif
+#endif
#if defined(WIN32) && !defined(Windows95) && !defined(__BORLANDC__) && \
#endif
#endif
-/* MSVC and Borland C do not have lrintf */
-#if defined(_MSC_VER) || defined(__BORLANDC__)
+/* MSVC before 2013 and Borland C do not have lrintf */
+#if defined(_MSC_VER) && (_MSC_VER < 1800) || defined(__BORLANDC__)
static INLINE long lrintf(float f){
#ifdef _M_X64
return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
#endif
#include "opj_inttypes.h"
-#include "j2k_lib.h"
+#include "opj_clock.h"
#include "opj_malloc.h"
+#include "function_list.h"
#include "event.h"
#include "bio.h"
#include "cio.h"
#include "image.h"
+#include "invert.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 "tgt.h"
#include "tcd.h"
#include "t1.h"
#include "dwt.h"
#include "mct.h"
#include "opj_intmath.h"
+#ifdef USE_JPIP
#include "cidx_manager.h"
#include "indexbox_manager.h"
+#endif
/* JPWL>> */
#ifdef USE_JPWL
/* <<JPWL */
/* V2 */
-#include "function_list.h"
+#include "opj_codec.h"
+
#endif /* OPJ_INCLUDES_H */