ultrares needs 40G mem

Author: yumisims

Header.h

@@ -321,11 +321,13 @@ PushSize_(memory_arena *arena, u64 size, u32 alignment_pow2 = Default_Memory_Ali
     {
 	result = 0;
 #if defined(__APPLE__) || defined(_WIN32)
-	printf("Push of %llu bytes failed, out of memory.\n", size);   
+	fprintf(stderr, "Push of %llu bytes failed, out of memory (arena: %llu/%llu used).\n",
+		(unsigned long long)size, (unsigned long long)arena->currentSize, (unsigned long long)arena->maxSize);
 #else
-	printf("Push of %lu bytes failed, out of memory.\n", size);
-#endif	
-	*((volatile u32 *)0) = 0;
+	fprintf(stderr, "Push of %lu bytes failed, out of memory (arena: %lu/%lu used).\n",
+		(unsigned long)size, (unsigned long)arena->currentSize, (unsigned long)arena->maxSize);
+#endif
+	exit(EXIT_FAILURE);
     }
     else
     {

PretextMap.cpp

@@ -1907,7 +1907,12 @@ ContrastEqualisation(void *in)
             }
         }
     }
-    
+
+    if (max <= min)
+    {
+        return;
+    }
+
     f32 scaleFactor = 254.0f / (f32)(max - min);
 
     ForLoop(nPixels)
@@ -2006,6 +2011,11 @@ ContrastEqualisation(void *in)
         }
     }
 
+    if (max <= min)
+    {
+        return;
+    }
+
     scaleFactor = 255.0f / (f32)(max - min);
 
     ForLoop(nPixels)
@@ -2422,8 +2432,7 @@ MainArgs
     PrintStatus("Initializing working set mutex");
     InitialiseMutex(Working_Set_rwMutex);
 
-    // ***  What will the actual, required memory size be?  ***
-    u64 memorySize = ultraRes ? 24 : (highRes ? 16 : 3);
+    u64 memorySize = ultraRes ? 40 : (highRes ? 16 : 3);
     PrintStatus("Creating memory arena of size %lu GB", memorySize);
     CreateMemoryArena(Working_Set, GigaByte(memorySize));