diff --git a/data/darwin/Mitsuba.dmgCanvas/Disk Image b/data/darwin/Mitsuba.dmgCanvas/Disk Image index 1a8fd156..261705ac 100644 Binary files a/data/darwin/Mitsuba.dmgCanvas/Disk Image and b/data/darwin/Mitsuba.dmgCanvas/Disk Image differ diff --git a/data/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg b/data/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg index f7e4f068..9dbf81bd 100644 Binary files a/data/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg and b/data/darwin/Mitsuba.dmgCanvas/QuickLook/Preview.jpg differ diff --git a/data/darwin/build-dmg.sh b/data/darwin/build-dmg.sh index 15a477f4..3017d725 100755 --- a/data/darwin/build-dmg.sh +++ b/data/darwin/build-dmg.sh @@ -1,6 +1,6 @@ #!/bin/bash rm -f Mitsuba.app/*.log -dmgcanvas tools/darwin/Mitsuba.dmgCanvas Mitsuba\ $1.dmg -v "Mitsuba $1" -leopard-compatible yes +dmgcanvas data/darwin/Mitsuba.dmgCanvas Mitsuba\ $1.dmg -v "Mitsuba $1" -leopard-compatible yes #echo $1 > /tmp/version #scp /tmp/version ChangeLog wazlaf@mitsuba-renderer.org:/home/httpd/mitsuba-renderer.org/htdocs #scp Mitsuba\ $1.dmg wazlaf@mitsuba-renderer.org:/home/httpd/mitsuba-renderer.org/htdocs/releases diff --git a/src/libcore/util.cpp b/src/libcore/util.cpp index 88fbcf03..bf8e9f90 100644 --- a/src/libcore/util.cpp +++ b/src/libcore/util.cpp @@ -299,7 +299,7 @@ void restoreFPExceptions(bool oldState) { #if !defined(MTS_SSE) #warning SSE must be enabled to handle FP exceptions on OSX #else - currentState = query_fpexcept_sse() != 0 + currentState = query_fpexcept_sse() != 0; #endif #else currentState = fegetexcept() & (FE_INVALID|FE_DIVBYZERO|FE_OVERFLOW); diff --git a/src/qtgui/aboutdlg.cpp b/src/qtgui/aboutdlg.cpp index 3537c0c8..3b866887 100644 --- a/src/qtgui/aboutdlg.cpp +++ b/src/qtgui/aboutdlg.cpp @@ -66,7 +66,7 @@ AboutDialog::AboutDialog(QWidget *parent) : ui->label->setText(ui->label->text().replace("CONFIG_FLAGS", configFlags)); #if defined(__OSX__) - ui->label1->setText(ui->label->text().replace("font-size:10pt", "font-size:14pt")); + ui->label->setText(ui->label->text().replace("font-size:10pt", "font-size:14pt")); #endif } diff --git a/src/qtgui/aboutdlg.ui b/src/qtgui/aboutdlg.ui index d65694c5..4f61eab3 100644 --- a/src/qtgui/aboutdlg.ui +++ b/src/qtgui/aboutdlg.ui @@ -22,7 +22,7 @@ QLayout::SetMinimumSize - + 80