Merge changes from the witness.

src/nvimage/FloatImage.cpp

@@ -11,9 +11,10 @@
 #include "nvcore/Utils.h" // max
 #include "nvcore/Ptr.h"
 #include "nvcore/Memory.h"
-#include "nvcore/Array.h"
+#include "nvcore/Array.inl"
 
 #include <math.h>
+#include <string.h> // memset, memcpy
 
 
 using namespace nv;

src/nvimage/Image.cpp

@@ -8,6 +8,9 @@
 #include "nvcore/Debug.h"
 #include "nvcore/Ptr.h"
 #include "nvcore/Utils.h" // swap
+#include "nvcore/Memory.h" // realloc, free
+
+#include <string.h> // memcpy
 
 
 using namespace nv;