[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44572] trunk/blender/source/blender/imbuf : Fix for Multilayer EXR API.

[Lukas Toenne]

Revision: 44572
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44572
Author:   lukastoenne
Date:     2012-03-01 11:19:41 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
Fix for Multilayer EXR API. This was using implementation stubs directly in the header file, causing problems with scons in particular.

Modified Paths:
--------------
    trunk/blender/source/blender/imbuf/CMakeLists.txt
    trunk/blender/source/blender/imbuf/SConscript
    trunk/blender/source/blender/imbuf/intern/openexr/openexr_multi.h

Added Paths:
-----------
    trunk/blender/source/blender/imbuf/intern/openexr/openexr_stub.cpp

Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/CMakeLists.txt	2012-03-01 08:47:32 UTC (rev 44571)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt	2012-03-01 11:19:41 UTC (rev 44572)
@@ -104,6 +104,10 @@
 
 if(WITH_IMAGE_OPENEXR)
 	add_definitions(-DWITH_OPENEXR)
+else()
+	list(APPEND SRC
+		intern/openexr/openexr_stub.cpp
+	)
 endif()
 
 if(WITH_IMAGE_TIFF)

Modified: trunk/blender/source/blender/imbuf/SConscript
===================================================================
--- trunk/blender/source/blender/imbuf/SConscript	2012-03-01 08:47:32 UTC (rev 44571)
+++ trunk/blender/source/blender/imbuf/SConscript	2012-03-01 11:19:41 UTC (rev 44572)
@@ -20,6 +20,8 @@
 
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')
+else:
+    sources.append(os.path.join('intern', 'openexr', 'openexr_stub.cpp'))
 
 if env['WITH_BF_TIFF']:
     defs.append('WITH_TIFF')

Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_multi.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_multi.h	2012-03-01 08:47:32 UTC (rev 44571)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_multi.h	2012-03-01 11:19:41 UTC (rev 44572)
@@ -43,7 +43,10 @@
 #define EXR_PASS_MAXCHAN	8
 
 
-#ifdef WITH_OPENEXR
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void *	IMB_exr_get_handle			(void);
 void	IMB_exr_add_channel			(void *handle, const char *layname, const char *passname, int xstride, int ystride, float *rect);
 
@@ -64,36 +67,8 @@
 
 void	IMB_exr_close				(void *handle);
 
-
-#else
-
-/* ugly... but we only use it on pipeline.c, render module, now */
-
-void *	IMB_exr_get_handle			(void) {return NULL;}
-void	IMB_exr_add_channel			(void *handle, const char *layname, const char *channame, int xstride, int ystride, float *rect) {  (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
-
-int		IMB_exr_begin_read			(void *handle, const char *filename, int *width, int *height) { (void)handle; (void)filename; (void)width; (void)height; return 0;}
-int		IMB_exr_begin_write			(void *handle, const char *filename, int width, int height, int compress) { (void)handle; (void)filename; (void)width; (void)height; (void)compress; return 0;}
-void	IMB_exrtile_begin_write		(void *handle, const char *filename, int mipmap, int width, int height, int tilex, int tiley) { (void)handle; (void)filename; (void)mipmap; (void)width; (void)height; (void)tilex; (void)tiley; }
-
-void	IMB_exr_set_channel			(void *handle, char *layname, const char *channame, int xstride, int ystride, float *rect) { (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
-
-void	IMB_exr_read_channels		(void *handle) { (void)handle; }
-void	IMB_exr_write_channels		(void *handle) { (void)handle; }
-void	IMB_exrtile_write_channels	(void *handle, int partx, int party, int level) { (void)handle; (void)partx; (void)party; (void)level; }
-void	IMB_exrtile_clear_channels	(void *handle) { (void)handle; }
-
-void    IMB_exr_multilayer_convert	(void *handle, void *base,  
-									 void * (*addlayer)(void *base, char *str), 
-									 void (*addpass)(void *base, void *lay, char *str, float *rect, int totchan, char *chan_id))
-									{
-										(void)handle; (void)base; (void)addlayer; (void)addpass;
-									}
-
-void	IMB_exr_close				(void *handle) { (void)handle; }
-
+#ifdef __cplusplus
+} // extern "C"
 #endif
 
-
-
 #endif /* __OPENEXR_MULTI_H */

Added: trunk/blender/source/blender/imbuf/intern/openexr/openexr_stub.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_stub.cpp	                        (rev 0)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_stub.cpp	2012-03-01 11:19:41 UTC (rev 44572)
@@ -0,0 +1,58 @@
+/** \file blender/imbuf/intern/openexr/openexr_stub.cpp
+ *  \ingroup openexr
+ */
+/*
+*
+ * ***** BEGIN GPLLICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Copyright by Gernot Ziegler <gz at lysator.liu.se>.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): Austin Benesh, Ton Roosendaal (float, half, speedup, cleanup...).
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+
+#include "openexr_api.h"
+#include "openexr_multi.h"
+
+
+void *	IMB_exr_get_handle			(void) {return NULL;}
+void	IMB_exr_add_channel			(void *handle, const char *layname, const char *channame, int xstride, int ystride, float *rect) {  (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
+
+int		IMB_exr_begin_read			(void *handle, const char *filename, int *width, int *height) { (void)handle; (void)filename; (void)width; (void)height; return 0;}
+int		IMB_exr_begin_write			(void *handle, const char *filename, int width, int height, int compress) { (void)handle; (void)filename; (void)width; (void)height; (void)compress; return 0;}
+void	IMB_exrtile_begin_write		(void *handle, const char *filename, int mipmap, int width, int height, int tilex, int tiley) { (void)handle; (void)filename; (void)mipmap; (void)width; (void)height; (void)tilex; (void)tiley; }
+
+void	IMB_exr_set_channel			(void *handle, const char *layname, const char *channame, int xstride, int ystride, float *rect) { (void)handle; (void)layname; (void)channame; (void)xstride; (void)ystride; (void)rect; }
+
+void	IMB_exr_read_channels		(void *handle) { (void)handle; }
+void	IMB_exr_write_channels		(void *handle) { (void)handle; }
+void	IMB_exrtile_write_channels	(void *handle, int partx, int party, int level) { (void)handle; (void)partx; (void)party; (void)level; }
+void	IMB_exrtile_clear_channels	(void *handle) { (void)handle; }
+
+void    IMB_exr_multilayer_convert	(void *handle, void *base,  
+									 void * (*addlayer)(void *base, char *str), 
+									 void (*addpass)(void *base, void *lay, char *str, float *rect, int totchan, char *chan_id))
+									{
+										(void)handle; (void)base; (void)addlayer; (void)addpass;
+									}
+
+void	IMB_exr_close				(void *handle) { (void)handle; }