Merge changes from the witness.

12 years ago · 80783a810e
parent 1158df4973
commit 80783a810e
2 changed files with 5 additions and 1 deletions
--- a/trunk/src/nvimage/FloatImage.cpp
+++ b/trunk/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;
--- a/trunk/src/nvimage/Image.cpp
+++ b/trunk/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;