diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-15 12:58:32 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-10-15 12:58:32 +0000 |
| commit | b08b90d71c3360f8f0544123268b34e6fa73afdb (patch) | |
| tree | 6aa1b8f1dc048a8bde59a693eedd4c46cda1e2c2 /src | |
| parent | b46ed8c7a38d1820f4ec186b882e080ac03bd7d0 (diff) | |
[trunk]rename j2k_lib to opj_clock
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/openjp2/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/lib/openjp2/opj_clock.c (renamed from src/lib/openjp2/j2k_lib.c) | 0 | ||||
| -rw-r--r-- | src/lib/openjp2/opj_clock.h (renamed from src/lib/openjp2/j2k_lib.h) | 12 | ||||
| -rw-r--r-- | src/lib/openjp2/opj_includes.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt index 34a5ef3c..33281588 100644 --- a/src/lib/openjp2/CMakeLists.txt +++ b/src/lib/openjp2/CMakeLists.txt @@ -16,12 +16,12 @@ set(OPENJPEG_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/event.c ${CMAKE_CURRENT_SOURCE_DIR}/image.c ${CMAKE_CURRENT_SOURCE_DIR}/j2k.c - ${CMAKE_CURRENT_SOURCE_DIR}/j2k_lib.c ${CMAKE_CURRENT_SOURCE_DIR}/jp2.c ${CMAKE_CURRENT_SOURCE_DIR}/jpt.c ${CMAKE_CURRENT_SOURCE_DIR}/mct.c ${CMAKE_CURRENT_SOURCE_DIR}/mqc.c ${CMAKE_CURRENT_SOURCE_DIR}/openjpeg.c + ${CMAKE_CURRENT_SOURCE_DIR}/opj_clock.c ${CMAKE_CURRENT_SOURCE_DIR}/pi.c ${CMAKE_CURRENT_SOURCE_DIR}/raw.c ${CMAKE_CURRENT_SOURCE_DIR}/t1.c diff --git a/src/lib/openjp2/j2k_lib.c b/src/lib/openjp2/opj_clock.c index dbbf6e0a..dbbf6e0a 100644 --- a/src/lib/openjp2/j2k_lib.c +++ b/src/lib/openjp2/opj_clock.c diff --git a/src/lib/openjp2/j2k_lib.h b/src/lib/openjp2/opj_clock.h index 73a14c7d..d3fcec37 100644 --- a/src/lib/openjp2/j2k_lib.h +++ b/src/lib/openjp2/opj_clock.h @@ -23,13 +23,13 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef __J2K_LIB_H -#define __J2K_LIB_H +#ifndef __OPJ_CLOCK_H +#define __OPJ_CLOCK_H /** -@file j2k_lib.h -@brief Internal functions +@file opj_clock.h +@brief Internal function for timing -The functions in J2K_LIB.C are internal utilities mainly used for timing. +The functions in OPJ_CLOCK.C are internal utilities mainly used for timing. */ /** @defgroup MISC MISC - Miscellaneous internal functions */ @@ -50,5 +50,5 @@ OPJ_FLOAT64 opj_clock(void); /*@}*/ -#endif /* __J2K_LIB_H */ +#endif /* __OPJ_CLOCK_H */ diff --git a/src/lib/openjp2/opj_includes.h b/src/lib/openjp2/opj_includes.h index a6a84688..427bf8b4 100644 --- a/src/lib/openjp2/opj_includes.h +++ b/src/lib/openjp2/opj_includes.h @@ -146,7 +146,7 @@ static INLINE long lrintf(float f){ #endif #include "opj_inttypes.h" -#include "j2k_lib.h" +#include "opj_clock.h" #include "opj_malloc.h" #include "event.h" #include "bio.h" |