walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

ENH: remove INLINE from forward decl. Fix CMakeLists.txt for UNIX platforms

This commit is contained in:
Mathieu Malaterre 2008-08-02 16:40:10 +00:00
parent fcede9f913
commit c5ec4896fe
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -5,6 +5,9 @@ What's New for OpenJPEG
! : changed ! : changed
+ : added + : added
August 2nd, 2008
* [Mathieu Malaterre] remove INLINE from forward decl. Fix CMakeLists.txt for UNIX platforms
August 1st, 2008 August 1st, 2008
- [antonin] removed t1_generate_luts.c, useless in version 2. - [antonin] removed t1_generate_luts.c, useless in version 2.
! [antonin] updated XCode project file for mac users. ! [antonin] updated XCode project file for mac users.

8
Free_CMakeImport.cmake
View File

@ -7,8 +7,12 @@
INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libs/FreeImage) INCLUDE_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libs/FreeImage)
# Link libraries # Link libraries
IF(WIN32)
LINK_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libs/FreeImage) LINK_DIRECTORIES(${OPENJPEG_SOURCE_DIR}/libs/FreeImage)
LINK_LIBRARIES(freeimage.s) LINK_LIBRARIES(freeimage.s)
ADD_DEFINITIONS ( -DFREEIMAGE_LIB ) ELSE(WIN32)
LINK_LIBRARIES(freeimage)
ENDIF(WIN32)
ADD_DEFINITIONS ( -DFREEIMAGE_LIB )

4
libopenjpeg/CMakeLists.txt
View File

@ -63,6 +63,10 @@ ENDIF(ENABLE_PROFILING)
ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS})
SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES
${OPENJPEG_LIBRARY_PROPERTIES}) ${OPENJPEG_LIBRARY_PROPERTIES})
IF(UNIX)
TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} m)
ENDIF(UNIX)
# Install library # Install library
INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME} INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}

2
libopenjpeg/dwt.c
View File

@ -128,7 +128,7 @@ static bool dwt_decode_tile(opj_tcd_tilecomp_t* tilec, OPJ_UINT32 i, DWT1DFN fn)
static OPJ_UINT32 dwt_max_resolution(opj_tcd_resolution_t* restrict r, OPJ_UINT32 i); static OPJ_UINT32 dwt_max_resolution(opj_tcd_resolution_t* restrict r, OPJ_UINT32 i);
static INLINE bool dwt_encode_procedure(opj_tcd_tilecomp_t * tilec,void (*p_function)(OPJ_INT32 *, OPJ_INT32,OPJ_INT32,OPJ_INT32) ); static bool dwt_encode_procedure(opj_tcd_tilecomp_t * tilec,void (*p_function)(OPJ_INT32 *, OPJ_INT32,OPJ_INT32,OPJ_INT32) );
/*@}*/ /*@}*/
/*@}*/ /*@}*/