Use C++11 right angle brackets.

[cubemap] / input.cpp

diff --git a/input.cpp b/input.cpp
index f5d8d5ef19ff8dced7f5d75a73b5a724b2942a82..7f95b2693a96ea0e56f858eb484c68e8f7a84031 100644 (file)
--- a/input.cpp
+++ b/input.cpp
@@ -94,16 +94,17 @@ bool parse_url(const string &url, string *protocol, string *user, string *host,
        return true;
 }
 
-Input *create_input(const std::string &url)
+Input *create_input(const string &url, Input::Encoding encoding)
 {
        string protocol, user, host, port, path;
        if (!parse_url(url, &protocol, &user, &host, &port, &path)) {
                return NULL;
        }
        if (protocol == "http") {
-               return new HTTPInput(url);
+               return new HTTPInput(url, encoding);
        }
        if (protocol == "udp") {
+               // encoding is ignored; it's never Metacube.
                return new UDPInput(url);
        }
        return NULL;