From 66af9969d63736e7d68e7b79aa805d096a12d80e Mon Sep 17 00:00:00 2001 From: jacob1 Date: Mon, 3 Sep 2012 20:21:55 -0400 Subject: [PATCH] Fix one more compiling error (was using outdated SearchModel.h so reverted to official version) --- src/Config.h | 2 +- src/Format.cpp | 2 +- src/search/SearchModel.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Config.h b/src/Config.h index a0e5dfe71..385f216f9 100644 --- a/src/Config.h +++ b/src/Config.h @@ -181,7 +181,7 @@ extern unsigned char ZSIZE; #ifdef WIN #define strcasecmp stricmp -#endif //_MSC_VER +#endif #if defined(_MSC_VER) #define fmin(a,b) (((a) < (b)) ? (a) : (b)) #define fminf(a,b) (((a) < (b)) ? (a) : (b)) diff --git a/src/Format.cpp b/src/Format.cpp index 78e4a4f10..c290e71d0 100644 --- a/src/Format.cpp +++ b/src/Format.cpp @@ -4,7 +4,7 @@ #include #include #include -#include "zlib.h" +#include #include #include "Format.h" #include "graphics/Graphics.h" diff --git a/src/search/SearchModel.h b/src/search/SearchModel.h index a2ea5b704..c89409051 100644 --- a/src/search/SearchModel.h +++ b/src/search/SearchModel.h @@ -61,7 +61,7 @@ public: vector GetSaveList(); vector > GetTagList(); string GetLastError() { return lastError; } - int GetPageCount() { return max(1, (int)(ceil(resultCount/16))); } + int GetPageCount() { return max(1, (int)(ceil(resultCount/16.0f))); } int GetPageNum() { return currentPage; } std::string GetLastQuery() { return lastQuery; } void SetSort(string sort) { if(!updateSaveListWorking) { currentSort = sort; } notifySortChanged(); }