summaryrefslogtreecommitdiff
path: root/libopenjpeg/j2k_lib.c
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2005-12-08 09:38:47 +0000
committerAntonin Descampe <antonin@gmail.com>2005-12-08 09:38:47 +0000
commit95bc884365deb41c357583874c23d82eac7cad2d (patch)
treecbeb4c538d1bf2f253bc5d3aa21da2871032b670 /libopenjpeg/j2k_lib.c
parente45e87cfb7c7a131fcd7412e3fb228b61f3c999e (diff)
OpenJPEG version 1.1
Diffstat (limited to 'libopenjpeg/j2k_lib.c')
-rw-r--r--libopenjpeg/j2k_lib.c23
1 files changed, 11 insertions, 12 deletions
diff --git a/libopenjpeg/j2k_lib.c b/libopenjpeg/j2k_lib.c
index 8fad5ded..15c8e87c 100644
--- a/libopenjpeg/j2k_lib.c
+++ b/libopenjpeg/j2k_lib.c
@@ -24,7 +24,6 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-
#ifdef WIN32
#include <windows.h>
#else
@@ -36,22 +35,22 @@
double opj_clock() {
#ifdef WIN32
- /* WIN32: use QueryPerformance (very accurate) */
+ /* WIN32: use QueryPerformance (very accurate) */
LARGE_INTEGER freq , t ;
/* freq is the clock speed of the CPU */
QueryPerformanceFrequency(&freq) ;
- /* cout << "freq = " << ((double) freq.QuadPart) << endl; */
+ /* cout << "freq = " << ((double) freq.QuadPart) << endl; */
/* t is the high resolution performance counter (see MSDN) */
QueryPerformanceCounter ( & t ) ;
return ( t.QuadPart /(double) freq.QuadPart ) ;
#else
- /* Unix or Linux: use resource usage */
+ /* Unix or Linux: use resource usage */
struct rusage t;
double procTime;
/* (1) Get the rusage data structure at this moment (man getrusage) */
getrusage(0,&t);
/* (2) What is the elapsed time ? - CPU time = User time + System time */
- /* (2a) Get the seconds */
+ /* (2a) Get the seconds */
procTime = t.ru_utime.tv_sec + t.ru_stime.tv_sec;
/* (2b) More precisely! Get the microseconds part ! */
return ( procTime + (t.ru_utime.tv_usec + t.ru_stime.tv_usec) * 1e-6 ) ;
@@ -59,19 +58,19 @@ double opj_clock() {
}
void* opj_malloc( size_t size ) {
- void *memblock = malloc(size);
- if(memblock) {
- memset(memblock, 0, size);
- }
- return memblock;
+ void *memblock = malloc(size);
+ if(memblock) {
+ memset(memblock, 0, size);
+ }
+ return memblock;
}
void* j2k_realloc( void *memblock, size_t size ) {
- return realloc(memblock, size);
+ return realloc(memblock, size);
}
void opj_free( void *memblock ) {
- free(memblock);
+ free(memblock);
}