From: <hug...@li...> - 2012-01-18 09:14:37
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/01a4d85886b9 changeset: 5729:01a4d85886b9 user: harryvanderwolf <hv...@gm...> date: Wed Jan 18 10:14:15 2012 +0100 description: [OSX] correct Utils.cpp otherwise it even doesn't compile for 64bits; Doesn't solve bus error on 64bits diffstat: mac/Hugin.xcodeproj/project.pbxproj | 1 + src/hugin_cpfind/cpfind/Utils.cpp | 26 +++++++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diffs (47 lines): diff -r 52d31ba5dafc -r 01a4d85886b9 mac/Hugin.xcodeproj/project.pbxproj --- a/mac/Hugin.xcodeproj/project.pbxproj Tue Jan 17 17:31:14 2012 +0100 +++ b/mac/Hugin.xcodeproj/project.pbxproj Wed Jan 18 10:14:15 2012 +0100 @@ -14228,6 +14228,7 @@ "-framework", Foundation, ); + PER_ARCH_CFLAGS_x86_64 = "-march=core2 -mtune=core2 -ftree-vectorize"; PREBINDING = YES; PRODUCT_NAME = cpfind; ZERO_LINK = NO; diff -r 52d31ba5dafc -r 01a4d85886b9 src/hugin_cpfind/cpfind/Utils.cpp --- a/src/hugin_cpfind/cpfind/Utils.cpp Tue Jan 17 17:31:14 2012 +0100 +++ b/src/hugin_cpfind/cpfind/Utils.cpp Wed Jan 18 10:14:15 2012 +0100 @@ -65,19 +65,19 @@ return status.ullTotalPhys; }; #elif defined __APPLE__ -unsigned long long utils::getTotalMemory() -{ - long ramSize; - if(Gestalt(gestaltPhysicalRAMSizeInMegabytes, &ramSize)==noErr) - { - return ramSize * 1024 * 1024; - } - else - { - // if query was not successful return 1 GB, - // return 0 would result in crash in calling function - return 1024*1024*1024; - } +unsigned long long utils::getTotalMemory() +{ + SInt32 ramSize; + if(Gestalt(gestaltPhysicalRAMSizeInMegabytes, &ramSize)==noErr) + { + return ramSize * 1024 * 1024; + } + else + { + // if query was not successful return 1 GB, + // return 0 would result in crash in calling function + return 1024*1024*1024; + } }; #else unsigned long long utils::getTotalMemory() |