← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/poppler/oneiric-security

« back to all changes in this revision

Viewing changes to goo/GooTimer.cc

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2010-08-13 10:58:05 UTC
  • mfrom: (1.1.32 upstream)
  • Revision ID: james.westby@ubuntu.com-20100813105805-v6ybtufexxiska06
Tags: 0.14.2.is.0.14.1-0ubuntu1
* Revert previous upstream update. It bumped SONAME, but the packaging
  wasn't updated along with it, so we now have a broken libpoppler6. Provide
  a fixed one with this reversion until we can do the transition properly.
* debian/control: Update Breaks/Provides: to account for xpdf-utils now
  being a transitional package. Change forward ported from Debian's
  0.12.4-1.1 package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
goo/GooTimer.cc
6
6
//
7
7
// Copyright 2005 Jonathan Blandford <jrb@redhat.com>
8
8
// Copyright 2007 Krzysztof Kowalczyk <kkowalczyk@gmail.com>
9
 
// Copyright 2010 Hib Eris <hib@hiberis.nl>
10
9
// Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team
11
10
//
12
11
//========================================================================
33
32
void GooTimer::start() {
34
33
#ifdef HAVE_GETTIMEOFDAY
35
34
  gettimeofday(&start_time, NULL);
36
 
#elif defined(_WIN32)
 
35
#elif defined(_MSC_VER)
37
36
  QueryPerformanceCounter(&start_time);
38
37
#endif
39
38
  active = true;
42
41
void GooTimer::stop() {
43
42
#ifdef HAVE_GETTIMEOFDAY
44
43
  gettimeofday(&end_time, NULL);
45
 
#elif defined(_WIN32)
 
44
#elif defined(_MSC_VER)
46
45
  QueryPerformanceCounter(&end_time);
47
46
#endif
48
47
  active = false;
71
70
 
72
71
  return total;
73
72
}
74
 
#elif defined(_WIN32)
 
73
#elif defined(_MSC_VER)
75
74
double GooTimer::getElapsed()
76
75
{
77
76
  LARGE_INTEGER   freq;