Add support for dpi based HUD scaling

[minetest.git] / src / filecache.cpp

diff --git a/src/filecache.cpp b/src/filecache.cpp
index 47e3465967f89869f18aa508f43261ef9ea96453..33677cc8379a2984312b613f9ec9edeb03da237d 100644 (file)
--- a/src/filecache.cpp
+++ b/src/filecache.cpp
@@ -1,7 +1,7 @@
 /*
-Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
-Copyright (C) 2012 Jonathan Neuschäfer <j.neuschaefer@gmx.net>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2013 Jonathan Neuschäfer <j.neuschaefer@gmx.net>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU Lesser General Public License as published by
@@ -23,12 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "clientserver.h"
 #include "log.h"
 #include "filesys.h"
-#include "utility.h"
-#include "hex.h"
-#include "sha1.h"
 #include <string>
 #include <iostream>
 #include <fstream>
+#include <stdlib.h>
 
 bool FileCache::loadByPath(const std::string &path, std::ostream &os)
 {
@@ -84,36 +82,8 @@ bool FileCache::update(const std::string &name, const std::string &data)
        std::string path = m_dir + DIR_DELIM + name;
        return updateByPath(path, data);
 }
-bool FileCache::update_sha1(const std::string &data)
-{
-       SHA1 sha1;
-       sha1.addBytes(data.c_str(), data.size());
-       unsigned char *digest = sha1.getDigest();
-       std::string sha1_raw((char*)digest, 20);
-       free(digest);
-       std::string sha1_hex = hex_encode(sha1_raw);
-       return update(sha1_hex, data);
-}
 bool FileCache::load(const std::string &name, std::ostream &os)
 {
        std::string path = m_dir + DIR_DELIM + name;
        return loadByPath(path, os);
 }
-bool FileCache::load_sha1(const std::string &sha1_raw, std::ostream &os)
-{
-       std::ostringstream tmp_os(std::ios_base::binary);
-       if(!load(hex_encode(sha1_raw), tmp_os))
-               return false;
-       SHA1 sha1;
-       sha1.addBytes(tmp_os.str().c_str(), tmp_os.str().length());
-       unsigned char *digest = sha1.getDigest();
-       std::string sha1_real_raw((char*)digest, 20);
-       free(digest);
-       if(sha1_real_raw != sha1_raw){
-               verbosestream<<"FileCache["<<m_dir<<"]: filename "<<sha1_real_raw
-                               <<" mismatches actual checksum"<<std::endl;
-               return false;
-       }
-       os<<tmp_os.str();
-       return true;
-}