From b130487c2a58ce1e6b26b277ac018222fde99eed Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Mon, 30 Apr 2012 23:03:00 +0000
Subject: [PATCH] Merge changes from the witness.

---
 src/nvimage/FloatImage.cpp | 3 ++-
 src/nvimage/Image.cpp      | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/nvimage/FloatImage.cpp b/src/nvimage/FloatImage.cpp
index 86a3680..c91da6b 100644
--- a/src/nvimage/FloatImage.cpp
+++ b/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;
diff --git a/src/nvimage/Image.cpp b/src/nvimage/Image.cpp
index 495110f..3438b32 100644
--- a/src/nvimage/Image.cpp
+++ b/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;