Remove glm dependency

This commit is contained in:
Atlante45 2015-01-12 17:00:39 -08:00
parent 74d819fe25
commit b6ba82653f

View file

@ -16,12 +16,14 @@
#include <QTimer> #include <QTimer>
#include <QtDebug> #include <QtDebug>
#include <glm/glm.hpp>
#include "NetworkAccessManager.h" #include "NetworkAccessManager.h"
#include "ResourceCache.h" #include "ResourceCache.h"
#define clamp(x, min, max) (((x) < (min)) ? (min) :\
(((x) > (max)) ? (max) :\
(x)))
ResourceCache::ResourceCache(QObject* parent) : ResourceCache::ResourceCache(QObject* parent) :
QObject(parent) { QObject(parent) {
} }
@ -72,7 +74,7 @@ QSharedPointer<Resource> ResourceCache::getResource(const QUrl& url, const QUrl&
} }
void ResourceCache::setUnusedResourceCacheSize(qint64 unusedResourcesMaxSize) { void ResourceCache::setUnusedResourceCacheSize(qint64 unusedResourcesMaxSize) {
_unusedResourcesMaxSize = glm::clamp(unusedResourcesMaxSize, MIN_UNUSED_MAX_SIZE, MAX_UNUSED_MAX_SIZE); _unusedResourcesMaxSize = clamp(unusedResourcesMaxSize, MIN_UNUSED_MAX_SIZE, MAX_UNUSED_MAX_SIZE);
reserveUnusedResource(0); reserveUnusedResource(0);
} }