summaryrefslogtreecommitdiffstats
path: root/src/LinearUpscale.h
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-10-23 14:59:42 +0200
committerHowaner <franzi.moos@googlemail.com>2014-10-23 14:59:42 +0200
commit72bb299a4a4f74840c3b368c6669ddc3d32006ee (patch)
tree748fee756010b1f36aa95162f762e21ee0d19c0a /src/LinearUpscale.h
parentMerge branch 'master' into ChunkLoader (diff)
parentFixed a crash in redstone simulator. (diff)
downloadcuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.gz
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.bz2
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.lz
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.xz
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.tar.zst
cuberite-72bb299a4a4f74840c3b368c6669ddc3d32006ee.zip
Diffstat (limited to '')
-rw-r--r--src/LinearUpscale.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/LinearUpscale.h b/src/LinearUpscale.h
index a49f4bdf9..1b0fbd89a 100644
--- a/src/LinearUpscale.h
+++ b/src/LinearUpscale.h
@@ -95,8 +95,8 @@ template <typename TYPE> void LinearUpscale2DArray(
const int MAX_UPSCALE_X = 128;
const int MAX_UPSCALE_Y = 128;
- ASSERT(a_Src != NULL);
- ASSERT(a_Dst != NULL);
+ ASSERT(a_Src != nullptr);
+ ASSERT(a_Dst != nullptr);
ASSERT(a_SrcSizeX > 0);
ASSERT(a_SrcSizeY > 0);
ASSERT(a_UpscaleX > 0);
@@ -166,8 +166,8 @@ template <typename TYPE> void LinearUpscale3DArray(
const int MAX_UPSCALE_Y = 128;
const int MAX_UPSCALE_Z = 128;
- ASSERT(a_Src != NULL);
- ASSERT(a_Dst != NULL);
+ ASSERT(a_Src != nullptr);
+ ASSERT(a_Dst != nullptr);
ASSERT(a_SrcSizeX > 0);
ASSERT(a_SrcSizeY > 0);
ASSERT(a_SrcSizeZ > 0);