# Check if some include files are provided by the system
include(EnsureFileInclude)
# These files are mandatory
-ensure_file_include("string.h" HAVE_STRING_H YES)
-ensure_file_include("memory.h" HAVE_MEMORY_H YES)
-ensure_file_include("stdlib.h" HAVE_STDLIB_H YES)
-ensure_file_include("stdio.h" HAVE_STDIO_H YES)
-ensure_file_include("math.h" HAVE_MATH_H YES)
-ensure_file_include("float.h" HAVE_FLOAT_H YES)
-ensure_file_include("time.h" HAVE_TIME_H YES)
-ensure_file_include("stdarg.h" HAVE_STDARG_H YES)
-ensure_file_include("ctype.h" HAVE_CTYPE_H YES)
-ensure_file_include("assert.h" HAVE_ASSERT_H YES)
-
-# For the following files, we provide an alternative, they are not mandatory
-ensure_file_include("stdint.h" OPJ_HAVE_STDINT_H NO)
-ensure_file_include("inttypes.h" OPJ_HAVE_INTTYPES_H NO)
+ensure_file_include("string.h" HAVE_STRING_H YES)
+ensure_file_include("memory.h" HAVE_MEMORY_H YES)
+ensure_file_include("stdlib.h" HAVE_STDLIB_H YES)
+ensure_file_include("stdio.h" HAVE_STDIO_H YES)
+ensure_file_include("math.h" HAVE_MATH_H YES)
+ensure_file_include("float.h" HAVE_FLOAT_H YES)
+ensure_file_include("time.h" HAVE_TIME_H YES)
+ensure_file_include("stdarg.h" HAVE_STDARG_H YES)
+ensure_file_include("ctype.h" HAVE_CTYPE_H YES)
+ensure_file_include("assert.h" HAVE_ASSERT_H YES)
+ensure_file_include("stdint.h" HAVE_STDINT_H YES)
+ensure_file_include("inttypes.h" HAVE_INTTYPES_H YES)
# why check this one ? for openjpip ?
include (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
#include <string.h>
#include <ctype.h>
#include <limits.h>
+#include <inttypes.h>
#ifndef OPJ_HAVE_LIBTIFF
# error OPJ_HAVE_LIBTIFF_NOT_DEFINED
#include <tiffio.h>
#include "openjpeg.h"
#include "convert.h"
-#include "opj_inttypes.h"
/* -->> -->> -->> -->>
#include <stdio.h>
#include <math.h>
#include <string.h>
+#include <inttypes.h>
#include "openjpeg.h"
#include "index.h"
-#include "opj_inttypes.h"
/* ------------------------------------------------------------------------------------ */
${CMAKE_CURRENT_SOURCE_DIR}/opj_intmath.h
${CMAKE_CURRENT_SOURCE_DIR}/opj_malloc.c
${CMAKE_CURRENT_SOURCE_DIR}/opj_malloc.h
- ${CMAKE_CURRENT_SOURCE_DIR}/opj_stdint.h
${CMAKE_CURRENT_SOURCE_DIR}/sparse_array.c
${CMAKE_CURRENT_SOURCE_DIR}/sparse_array.h
)
)
# Install includes files
-install(FILES openjpeg.h opj_stdint.h
+install(FILES openjpeg.h
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
)
typedef double OPJ_FLOAT64;
typedef unsigned char OPJ_BYTE;
-#include "opj_stdint.h"
+#include <stdint.h>
typedef int8_t OPJ_INT8;
typedef uint8_t OPJ_UINT8;
/* create opj_config.h for CMake */
-#cmakedefine OPJ_HAVE_STDINT_H @OPJ_HAVE_STDINT_H@
/*--------------------------------------------------------------------------*/
/* OpenJPEG Versioning */
/* create opj_config_private.h for CMake */
-#cmakedefine OPJ_HAVE_INTTYPES_H @OPJ_HAVE_INTTYPES_H@
#define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@"
/*#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@*/
/*#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ */
/*#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@*/
+/*#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@ */
+/*#cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@ */
#cmakedefine _LARGEFILE_SOURCE
#cmakedefine _LARGE_FILES
#include <ctype.h>
#include <assert.h>
#include <limits.h>
+#include <stdint.h>
+#include <inttypes.h>
/*
Use fseeko() and ftello() if they are available since they use
#define OPJ_UNUSED(x) (void)x
-#include "opj_inttypes.h"
#include "opj_clock.h"
#include "opj_malloc.h"
#include "event.h"
+++ /dev/null
-/*
- * The copyright in this software is being made available under the 2-clauses
- * BSD License, included below. This software may be subject to other third
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2012, Mathieu Malaterre <mathieu.malaterre@gmail.com>
- * 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_INTTYPES_H
-#define OPJ_INTTYPES_H
-
-#include "opj_config_private.h"
-#ifdef OPJ_HAVE_INTTYPES_H
-#include <inttypes.h>
-#else
-#if defined(_WIN32)
-#define PRId64 "I64d"
-#define PRIi64 "I64i"
-#define PRIu64 "I64u"
-#define PRIx64 "I64x"
-#else
-#error unsupported platform
-#endif
-#endif
-
-#endif /* OPJ_INTTYPES_H */
+++ /dev/null
-/*
- * The copyright in this software is being made available under the 2-clauses
- * BSD License, included below. This software may be subject to other third
- * party and contributor rights, including patent rights, and no such rights
- * are granted under this license.
- *
- * Copyright (c) 2012, Mathieu Malaterre <mathieu.malaterre@gmail.com>
- * 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_STDINT_H
-#define OPJ_STDINT_H
-
-#include "opj_config.h"
-#ifdef OPJ_HAVE_STDINT_H
-#include <stdint.h>
-#else
-#if defined(_WIN32)
-typedef signed __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef signed __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef signed __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef signed __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-#else
-#error unsupported platform
-#endif
-#endif
-
-#endif /* OPJ_STDINT_H */
#include <string.h>
#include <stdio.h>
#include <assert.h>
-
-typedef int OPJ_BOOL;
-#define OPJ_TRUE 1
-#define OPJ_FALSE 0
-
-#include "opj_stdint.h"
+#include <stdint.h>
typedef int8_t OPJ_INT8;
typedef uint8_t OPJ_UINT8;
typedef uint32_t OPJ_UINT32;
typedef int64_t OPJ_INT64;
typedef uint64_t OPJ_UINT64;
+typedef int OPJ_BOOL;
+#define OPJ_TRUE 1
+#define OPJ_FALSE 0
//************************************************************************/
/** @brief HT decoding tables, as given in the standard
#include <stdlib.h>
#include <ctype.h>
#include <assert.h>
+#include <inttypes.h>
#include "box_manager.h"
-#include "opj_inttypes.h"
#ifdef SERVER
#include "fcgi_stdio.h"
#include <stdlib.h>
#include <string.h>
#include <stdlib.h>
+#include <inttypes.h>
#include "boxheader_manager.h"
-#include "opj_inttypes.h"
#ifdef SERVER
#include "fcgi_stdio.h"
#define BYTE_MANAGER_H_
#include <stddef.h>
+#include <stdint.h>
#include "openjpeg.h"
-#include "opj_stdint.h"
typedef uint8_t Byte_t;
typedef uint16_t Byte2_t;
typedef uint32_t Byte4_t;
#include <stdio.h>
#include <stdlib.h>
+#include <inttypes.h>
#include "cachemodel_manager.h"
#include "faixbox_manager.h"
-#include "opj_inttypes.h"
#ifdef SERVER
#include "fcgi_stdio.h"
*/
#include <stdio.h>
+#include <inttypes.h>
#include "codestream_manager.h"
-#include "opj_inttypes.h"
#ifdef SERVER
#include "fcgi_stdio.h"
#include <string.h>
#include <assert.h>
#include <limits.h>
+#include <inttypes.h>
#include "dec_clientmsg_handler.h"
#include "ihdrbox_manager.h"
#include "jpipstream_manager.h"
#include "jp2k_encoder.h"
-#include "opj_inttypes.h"
void handle_JPIPstreamMSG(SOCKET connected_socket, cachelist_param_t *cachelist,
Byte_t **jpipstream, OPJ_SIZE_T *streamlen, msgqueue_param_t *msgqueue)
#include <stdio.h>
#include <stdlib.h>
+#include <inttypes.h>
#include "faixbox_manager.h"
-#include "opj_inttypes.h"
#ifdef SERVER
#include "fcgi_stdio.h"
#include <stdlib.h>
#include <math.h>
#include <string.h>
+#include <inttypes.h>
-#include "opj_inttypes.h"
#include "index_manager.h"
#include "box_manager.h"
#include "manfbox_manager.h"
#include <string.h>
#include <math.h>
#include <assert.h>
+#include <inttypes.h>
#include "jp2k_encoder.h"
#include "j2kheader_manager.h"
#include "imgreg_manager.h"
-#include "opj_inttypes.h"
#ifdef SERVER
*/
#include "metadata_manager.h"
-#include "opj_inttypes.h"
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#include <inttypes.h>
#include "mhixbox_manager.h"
-#include "opj_inttypes.h"
#ifdef SERVER
#include "fcgi_stdio.h"
#include <ctype.h>
#include <assert.h>
#include <limits.h>
+#include <inttypes.h>
#ifdef _WIN32
#include <io.h>
#else
#include "msgqueue_manager.h"
#include "metadata_manager.h"
#include "index_manager.h"
-#include "opj_inttypes.h"
#ifdef SERVER
#include "fcgi_stdio.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <inttypes.h>
#include "placeholder_manager.h"
-#include "opj_inttypes.h"
#ifdef SERVER
#include "fcgi_stdio.h"
#include <assert.h>
#include <string.h>
#include <stdlib.h>
+#include <stdint.h>
#include "query_parser.h"
-#include "opj_stdint.h"
#ifdef SERVER
#include "fcgi_stdio.h"
# define SOCK_MANAGER_H_
#include "byte_manager.h"
-#include "opj_stdint.h"
+#include <stdint.h>
#ifdef _WIN32
#include <winsock.h>