use multithreaded FFT

build/config-linux-gcc-debug.py

@@ -21,7 +21,7 @@ GLFLAGS        = ['-DGLEW_MX']
 BOOSTLIB       = ['boost_system', 'boost_filesystem', 'boost_thread']
 COLLADAINCLUDE = ['/usr/include/collada-dom', '/usr/include/collada-dom/1.4']
 COLLADALIB     = ['collada14dom', 'xml2']
-FFTWLIB        = ['fftw3']
+FFTWLIB        = ['fftw3_threads']
 
 # The following assumes that the Mitsuba bindings should be built for the
 # "default" Python version. It is also possible to build bindings for multiple

build/config-linux-gcc.py

@@ -21,7 +21,7 @@ GLFLAGS        = ['-DGLEW_MX']
 BOOSTLIB       = ['boost_system', 'boost_filesystem', 'boost_thread']
 COLLADAINCLUDE = ['/usr/include/collada-dom', '/usr/include/collada-dom/1.4']
 COLLADALIB     = ['collada14dom', 'xml2']
-FFTWLIB        = ['fftw3']
+FFTWLIB        = ['fftw3_threads']
 
 # The following assumes that the Mitsuba bindings should be built for the
 # "default" Python version. It is also possible to build bindings for multiple

build/config-linux-icl.py

@@ -21,7 +21,7 @@ GLFLAGS        = ['-DGLEW_MX']
 BOOSTLIB       = ['boost_system', 'boost_filesystem', 'boost_thread']
 COLLADAINCLUDE = ['/usr/include/collada-dom', '/usr/include/collada-dom/1.4']
 COLLADALIB     = ['collada14dom', 'xml2']
-FFTWLIB        = ['fftw3']
+FFTWLIB        = ['fftw3_threads']
 
 # The following assumes that the Mitsuba bindings should be built for the
 # "default" Python version. It is also possible to build bindings for multiple

src/libcore/bitmap.cpp

@@ -1903,6 +1903,7 @@ void Bitmap::writePNG(Stream *stream, int compression) const {
 	png_text *text = NULL;
 
 	Properties metadata(m_metadata);
+	if (!metadata.hasProperty("generatedBy"))
 		metadata.setString("generatedBy", "Mitsuba version " MTS_VERSION);
 
 	std::vector<std::string> keys = metadata.getPropertyNames();
@@ -2473,6 +2474,7 @@ void Bitmap::writeOpenEXR(Stream *stream,
 	#endif
 
 	Properties metadata(m_metadata);
+	if (!metadata.hasProperty("generatedBy"))
 		metadata.setString("generatedBy", "Mitsuba version " MTS_VERSION);
 
 	std::vector<std::string> keys = metadata.getPropertyNames();
@@ -3145,6 +3147,12 @@ void Bitmap::staticInitialization() {
 
 	/* Initialize the Bitmap format conversion */
 	FormatConverter::staticInitialization();
+
+#if defined(MTS_HAS_FFTW)
+	/* Initialize FFTW if enabled */
+	fftw_init_threads();
+	fftw_plan_with_nthreads(getCoreCount());
+#endif
 }
 
 void Bitmap::staticShutdown() {