Merge branch 'std_cpp11-dev' into dev (fixes #3635)

2017-02-21 20:37:21 +01:00
parent ac882d2ff2 f3090d146f
commit d2b4fe5e54
26 changed files with 303 additions and 267 deletions
--- a/rtengine/imageio.cc
+++ b/rtengine/imageio.cc
@@ -895,7 +895,7 @@ int ImageIO::loadPPMFromMemory(const char* buffer, int width, int height, bool s
        char swapped[line_length];

        for ( int row = 0; row < height; ++row ) {
-            ::swab(((char*)buffer) + (row * line_length), swapped, line_length);
+            ::rtengine::swab(((char*)buffer) + (row * line_length), swapped, line_length);
            setScanline(row, (unsigned char*)&swapped[0], bps);
        }
    } else {