minor

.hg_archival.txt

@@ -1,6 +1,6 @@
 repo: b6d71054df5712e643a0685bc3ba54b123db5729
-node: ebaba1c87e20484a1efac6375e6ca8543baac20e
+node: 2324072e9e0e2efb681c8b5354b7497a7e045669
 branch: default
 latesttag: oldrender
-latesttagdistance: 975
-changessincelatesttag: 1138
+latesttagdistance: 977
+changessincelatesttag: 1140

examples/Demo/src/TestHttp.h

@@ -53,7 +53,7 @@ public:
         task = HttpRequestTask::create();
         task->setUrl("http://oxygine.org/test/reply.php");
         vector<unsigned char> postBody;
-        for (unsigned char i = 0; i < 256; ++i)
+        for (int i = 0; i < 256; ++i)
             postBody.push_back(i);
         task->setPostData(postBody);
         task->addEventListener(HttpRequestTask::COMPLETE, CLOSURE(this, &TestHttp::onPostLoaded));

oxygine/src/Actor.cpp

@@ -591,7 +591,7 @@ namespace oxygine
     {
         _alpha = alpha;
     }
-    
+
     const Renderer::transform& Actor::getTransform() const
     {
         updateTransform();

oxygine/src/VisualStyle.cpp

@@ -69,12 +69,14 @@ namespace oxygine
         _Actor::deserialize(data);
         setColor(hex2color(data->node.attribute("color").as_string("ffffffff")));
     }
-    
-    const Color& VStyleActor::getColor() const {
+
+    const Color& VStyleActor::getColor() const
+    {
         return _vstyle.getColor();
     }
 
-    void VStyleActor::setColor(const Color& color) {
+    void VStyleActor::setColor(const Color& color)
+    {
         _vstyle.setColor(color);
     }
 }

oxygine/src/core/gl/NativeTextureGLES.cpp

@@ -293,7 +293,7 @@ namespace oxygine
             //_data.resize(_width)
         }
 
-        ImageData im =  ImageData(_width, _height, (int) (_data.size() / _height), _format, &_data.front());
+        ImageData im =  ImageData(_width, _height, (int)(_data.size() / _height), _format, &_data.front());
         return im.getRect(_lockRect);
     }
 
@@ -308,7 +308,7 @@ namespace oxygine
             glBindTexture(GL_TEXTURE_2D, (GLuint) _id);
             GLenum er = glGetError();
 
-            ImageData src = ImageData(_width, _height, (int) (_data.size() / _height), _format, &_data.front());
+            ImageData src = ImageData(_width, _height, (int)(_data.size() / _height), _format, &_data.front());
             ImageData locked = src.getRect(_lockRect);
 
             //glPixelStorei (GL_UNPACK_ALIGNMENT,  1);//byte align

oxygine/src/res/ResAtlas.cpp

@@ -745,7 +745,7 @@ namespace oxygine
 
                         size_t n = frames.size();
                         int column = n % columns;
-                        int row = (int) (n / columns);
+                        int row = (int)(n / columns);
 
                         frame.init2(ra, column, row, df,
                                     srcRect, destRect,

oxygine/src/text_utils/Node.cpp

@@ -138,7 +138,7 @@ namespace oxygine
 
         const Symbol* TextNode::getSymbol(int& pos) const
         {
-            if (_data.size() < pos)
+            if ((int)_data.size() < pos)
                 return &_data[pos];
             pos -= _data.size();
             return Node::getSymbol(pos);

oxygine/src/utils/ImageUtils.cpp

@@ -83,7 +83,7 @@ namespace oxygine
         for (size_t y = 0; y < cinfo.image_height; y++)
             for (size_t x = 0; x < cinfo.image_width; x++)
             {
-                unsigned int pixelIdx = (unsigned int) (((y * cinfo.image_height) + x) * cinfo.input_components);
+                unsigned int pixelIdx = (unsigned int)(((y * cinfo.image_height) + x) * cinfo.input_components);
 
                 if (x % 2 == y % 2)
                 {