mirror of
https://github.com/Cubitect/cubiomes-viewer.git
synced 2025-01-09 12:27:28 +08:00
Fix for the quad-structure search + make target change
1) fix the quad-structure search for large areas did not work correctly 2) changed make clean target to also clean up the cubiomes library
This commit is contained in:
parent
fbeee36a9e
commit
9571e70499
@ -25,6 +25,7 @@ win32: {
|
|||||||
|
|
||||||
# also compile cubiomes
|
# also compile cubiomes
|
||||||
QMAKE_PRE_LINK += $(MAKE) -C $$CUPATH -f $$CUPATH/makefile CFLAGS="-DSTRUCT_CONFIG_OVERRIDE=1" all
|
QMAKE_PRE_LINK += $(MAKE) -C $$CUPATH -f $$CUPATH/makefile CFLAGS="-DSTRUCT_CONFIG_OVERRIDE=1" all
|
||||||
|
QMAKE_CLEAN += $$CUPATH/*.o $$CUPATH/libcubiomes.a
|
||||||
|
|
||||||
TARGET = cubiomes-viewer
|
TARGET = cubiomes-viewer
|
||||||
|
|
||||||
|
@ -268,11 +268,15 @@ bool applyTranspose(std::vector<uint64_t>& slist,
|
|||||||
|
|
||||||
// does the set of candidates for this condition fit in memory?
|
// does the set of candidates for this condition fit in memory?
|
||||||
if ((uint64_t)slist.size() * sizeof(int64_t) * w*h >= bufmax)
|
if ((uint64_t)slist.size() * sizeof(int64_t) * w*h >= bufmax)
|
||||||
|
{
|
||||||
|
slist.clear();
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
list48.resize(slist.size() * w*h);
|
list48.resize(slist.size() * w*h);
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
|
slist.clear();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user