drewcassidy/nvidia-texture-tools
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge changes from the witness.

Browse Source
This commit is contained in:
castano 2012-04-30 23:03:00 +00:00
parent 1158df4973
commit 80783a810e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trunk/src/nvimage/FloatImage.cpp
View File

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

3
trunk/src/nvimage/Image.cpp
View File

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