From b46ed8c7a38d1820f4ec186b882e080ac03bd7d0 Mon Sep 17 00:00:00 2001 From: Mickael Savinaud Date: Mon, 15 Oct 2012 12:43:44 +0000 Subject: [PATCH] [trunk] modify type of opj_clock function --- src/lib/openjp2/j2k_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/openjp2/j2k_lib.c b/src/lib/openjp2/j2k_lib.c index a96df221..dbbf6e0a 100644 --- a/src/lib/openjp2/j2k_lib.c +++ b/src/lib/openjp2/j2k_lib.c @@ -42,11 +42,11 @@ OPJ_FLOAT64 opj_clock(void) { /* cout << "freq = " << ((double) freq.QuadPart) << endl; */ /* t is the high resolution performance counter (see MSDN) */ QueryPerformanceCounter ( & t ) ; - return ( t.QuadPart /(double) freq.QuadPart ) ; + return ( t.QuadPart /(OPJ_FLOAT64) freq.QuadPart ) ; #else /* Unix or Linux: use resource usage */ struct rusage t; - double procTime; + OPJ_FLOAT64 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 */