Code: добавлена возможность работы программы с файлом из сети

main.cpp

@@ -3,6 +3,8 @@
 #include "histogram.h"
 #include "svg.h"
 #include <curl/curl.h>
+#include <sstream>
+#include <string>
 
 using namespace std;
 
@@ -12,8 +14,7 @@ struct Input {
 };
 
 Input
-input_data(istream& stream){
+input_data(istream& stream, bool prompt){
-    bool prompt = true;
     size_t number_count;
     if (prompt){
         cerr << "Enter number count:" << endl;
@@ -34,27 +35,45 @@ input_data(istream& stream){
     stream >> in.bin_count;
     return in;
 }
+size_t
+write_data(void* items, size_t item_size, size_t item_count, void* ctx) {
+    size_t data_size = item_size * item_count;
+    stringstream* buffer = reinterpret_cast<stringstream*>(ctx);
+    auto text = reinterpret_cast<const char*>(items);
+    buffer->write(text, data_size);
+    return data_size;
+}
 
-
+Input
-int
+download(const string& address){
-main(int argc, char* argv[]) {
+    stringstream buffer;
-    if (argc > 1){
+    curl_global_init(CURL_GLOBAL_ALL);
-        CURL *curl = curl_easy_init();
+    CURL *curl = curl_easy_init();
         if(curl) {
             CURLcode res;
-            curl_easy_setopt(curl, CURLOPT_URL, argv[1]);
+            curl_easy_setopt(curl, CURLOPT_URL, address.c_str());
+            curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_data);
+            curl_easy_setopt(curl, CURLOPT_WRITEDATA, &buffer);
             res = curl_easy_perform(curl);
-            curl_easy_cleanup(curl);
+            if (res != 0) {
-            if (!res) {
                 curl_easy_strerror(res);
                 exit(1);
             }
+            curl_easy_cleanup(curl);
         }
-        return 0;
+    return input_data(buffer, false);
+}
+
+int
+main(int argc, char* argv[]) {
+    Input input;
+    if (argc > 1){
+        input = download(argv[1]);
     }
-    curl_global_init(CURL_GLOBAL_ALL);
+    else{
-    auto in = input_data(cin);
+        input = input_data(cin, true);
-    auto bins = make_histogram(in.numbers, in.bin_count);
+    }
+    auto bins = make_histogram(input.numbers, input.bin_count);
     show_histogram_svg(bins);
     return 0;
 }

svg.cpp

@@ -50,7 +50,7 @@ show_histogram_svg(const vector<size_t>& bins) {
     }
     for (size_t bin : bins) {
         double bin_width = BLOCK_WIDTH * bin;
-        if ((IMAGE_WIDTH - TEXT_WIDTH) < (bin * BLOCK_WIDTH)){
+        if ((IMAGE_WIDTH - TEXT_WIDTH) < (maxbin * BLOCK_WIDTH)){
             bin_width = (IMAGE_WIDTH - TEXT_WIDTH) * ( bin / maxbin );
         }
         svg_text(TEXT_LEFT, top + TEXT_BASELINE, to_string(bin));