summaryrefslogtreecommitdiff
path: root/libopenjpeg/j2k_lib.c
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2008-07-31 18:47:41 +0000
committerAntonin Descampe <antonin@gmail.com>2008-07-31 18:47:41 +0000
commit7caaea18b728ead4e45226aafc09dba01e514a2d (patch)
tree1d5d19df20b82cee63a7de94fc8e04e8426cb7c7 /libopenjpeg/j2k_lib.c
parent8407e057c9e10c8fc2b5f4be56e603fae3f9063d (diff)
Deleting obsolete files and directories, adding v2-specific files and directories, updating existing files to v2. See README.v2 for more info
Diffstat (limited to 'libopenjpeg/j2k_lib.c')
-rw-r--r--libopenjpeg/j2k_lib.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/libopenjpeg/j2k_lib.c b/libopenjpeg/j2k_lib.c
index 91aee007..3b86c728 100644
--- a/libopenjpeg/j2k_lib.c
+++ b/libopenjpeg/j2k_lib.c
@@ -27,13 +27,16 @@
#ifdef WIN32
#include <windows.h>
#else
-#include <sys/time.h>
+/*#include <sys/time.h>
#include <sys/resource.h>
#include <sys/times.h>
+*/
#endif /* WIN32 */
-#include "opj_includes.h"
+#include "j2k_lib.h"
-double opj_clock(void) {
+
+OPJ_FLOAT64 opj_clock(void) {
+#if 0
#ifdef WIN32
/* WIN32: use QueryPerformance (very accurate) */
LARGE_INTEGER freq , t ;
@@ -55,5 +58,8 @@ double opj_clock(void) {
/* (2b) More precisely! Get the microseconds part ! */
return ( procTime + (t.ru_utime.tv_usec + t.ru_stime.tv_usec) * 1e-6 ) ;
#endif
+
+#endif
+ return 0;
}