OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Made the timestamper use timeGetTime() instead of GetTickCount() on windows 

since timeGetTime() is more accurate.
This commit is contained in:
Davis King 2015-01-29 17:51:18 -05:00
parent a9c5c98d56
commit 9ed05fa730
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlib/CMakeLists.txt
View File

@ -136,9 +136,9 @@ if (NOT TARGET dlib)
# we want to link to the right stuff depending on our platform.
if (WIN32 AND NOT CYGWIN) ###############################################################################
if (DLIB_NO_GUI_SUPPORT)
set (dlib_needed_libraries ws2_32)
set (dlib_needed_libraries ws2_32 winmm)
else()
set (dlib_needed_libraries ws2_32 comctl32 gdi32 imm32)
set (dlib_needed_libraries ws2_32 winmm comctl32 gdi32 imm32)
endif()
elseif(APPLE) ############################################################################
find_library(pthreadlib pthread)

7
dlib/misc_api/misc_api_kernel_1.cpp
View File

@ -13,6 +13,11 @@
#include "../windows_magic.h"
#include <windows.h>
// tell visual studio to link to the library needed to call timeGetTime()
#ifdef _MSC_VER
#pragma comment (lib, "winmm.lib")
#endif
#ifdef __BORLANDC__
// Apparently the borland compiler doesn't define this.
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
@ -89,7 +94,7 @@ namespace dlib
get_timestamp (
) const
{
unsigned long temp = GetTickCount();
unsigned long temp = timeGetTime();
if (temp >= last_time)
{
last_time = temp;