Min

oxygine/src/HttpRequestTask.cpp

@@ -156,13 +156,13 @@ namespace oxygine
         return true;
     }
 
-    void HttpRequestTask::dispatchProgress(int delta, int loaded, int total)
+    void HttpRequestTask::dispatchProgress(size_t delta, size_t loaded, size_t total)
     {
         ProgressEvent event(delta, loaded, total);
         dispatchEvent(&event);
     }
 
-    void HttpRequestTask::asyncProgress(int delta, int loaded, int total)
+    void HttpRequestTask::asyncProgress(size_t delta, size_t loaded, size_t total)
     {
         if (_progressDispatched && loaded != total)//dispatch progress only once per frame
         {
@@ -219,15 +219,15 @@ namespace oxygine
             asyncProgress(_receivedContentSize, _receivedContentSize, _expectedContentSize);
     }
 
-    void HttpRequestTask::write(const void* data, unsigned int size)
+    void HttpRequestTask::write(const void* data, size_t size)
     {
         if (!_suitableResponse)
             return;
 
 
         if (_fhandle)
-        {
-            unsigned int written = file::write(_fhandle, data, size);
+        { 
+            unsigned int written = file::write(_fhandle, data, (unsigned int)size);
             if (written != size)
             {
                 log::messageln("WRITE FILE ERROR %d %d", written, size);

oxygine/src/HttpRequestTask.h

@@ -31,11 +31,11 @@ namespace oxygine
         {
         public:
             enum {EVENT = PROGRESS};
-            ProgressEvent(int Delta, int Loaded, int Total) : Event(PROGRESS), delta(Delta), loaded(Loaded), total(Total) {};
+            ProgressEvent(size_t Delta, size_t Loaded, size_t Total) : Event(PROGRESS), delta(Delta), loaded(Loaded), total(Total) {};
 
-            int delta;
-            int loaded;
-            int total;
+            size_t delta;
+            size_t loaded;
+            size_t total;
         };
 
         HttpRequestTask();
@@ -69,12 +69,12 @@ namespace oxygine
         void _finalize(bool error) override;
 
         void gotHeaders();
-        void write(const void* data, unsigned int size);
+        void write(const void* data, size_t size);
 
         //async
-        void asyncProgress(int delta, int loaded, int total);
+        void asyncProgress(size_t delta, size_t loaded, size_t total);
 
-        void dispatchProgress(int delta, int loaded, int total);
+        void dispatchProgress(size_t delta, size_t loaded, size_t total);
 
         virtual void _setFileName(const std::string& name) {}
         virtual void _setUrl(const std::string& url) {}

oxygine/src/core/ios/HttpRequestCocoaTask.mm

@@ -77,7 +77,7 @@ didReceiveResponse:(NSURLResponse *)response
     {
         NSHTTPURLResponse *httpResponse = ((NSHTTPURLResponse *)response);
         
-        long long size = [httpResponse expectedContentLength];
+        size_t size = size_t([httpResponse expectedContentLength]);
         
         int resp = (int)httpResponse.statusCode;
         
@@ -172,7 +172,7 @@ namespace oxygine
     void HttpRequestCocoaTask::write(NSData *data)
     {
         const void *ptr = [data bytes];
-        unsigned int len = [data length];
+        size_t len = [data length];
         HttpRequestTask::write(ptr, len);
     }