[Rawstudio-commit] r4430 - in trunk: plugins/colorspace-transform src

[Anders Brander]

Author: abrander
Date: 2014-10-14 22:54:21 +0200 (Tue, 14 Oct 2014)
New Revision: 4430

Modified:
   trunk/plugins/colorspace-transform/colorspace_transform.c
   trunk/plugins/colorspace-transform/colorspace_transform.h
   trunk/plugins/colorspace-transform/colorspace_transform_avx.c
   trunk/plugins/colorspace-transform/colorspace_transform_sse2.c
   trunk/src/gtk-helper.c
Log:
Bug #640: Guard lcms.h include by HAVE_LCMS (Patch by Emmanuel Viaud).

Modified: trunk/plugins/colorspace-transform/colorspace_transform.c
===================================================================
--- trunk/plugins/colorspace-transform/colorspace_transform.c   2014-02-09 
18:46:49 UTC (rev 4429)
+++ trunk/plugins/colorspace-transform/colorspace_transform.c   2014-10-14 
20:54:21 UTC (rev 4430)
@@ -20,7 +20,14 @@
 /* Plugin tmpl version 5 */
 
 #include <rawstudio.h>
+#include <config.h>
+#if defined(HAVE_LCMS2)
+#include <lcms2.h>
+#elif defined(HAVE_LCMS)
 #include <lcms.h>
+#else
+#error "LCMS v1 or LCMS v2 required"
+#endif
 #include "rs-cmm.h"
 #include "colorspace_transform.h"
 

Modified: trunk/plugins/colorspace-transform/colorspace_transform.h
===================================================================
--- trunk/plugins/colorspace-transform/colorspace_transform.h   2014-02-09 
18:46:49 UTC (rev 4429)
+++ trunk/plugins/colorspace-transform/colorspace_transform.h   2014-10-14 
20:54:21 UTC (rev 4430)
@@ -20,7 +20,14 @@
 /* Plugin tmpl version 5 */
 
 #include <rawstudio.h>
+#include <config.h>
+#if defined(HAVE_LCMS2)
+#include <lcms2.h>
+#elif defined(HAVE_LCMS)
 #include <lcms.h>
+#else
+#error "LCMS v1 or LCMS v2 required"
+#endif
 #include "rs-cmm.h"
 
 #define RS_TYPE_COLORSPACE_TRANSFORM (rs_colorspace_transform_type)

Modified: trunk/plugins/colorspace-transform/colorspace_transform_avx.c
===================================================================
--- trunk/plugins/colorspace-transform/colorspace_transform_avx.c       
2014-02-09 18:46:49 UTC (rev 4429)
+++ trunk/plugins/colorspace-transform/colorspace_transform_avx.c       
2014-10-14 20:54:21 UTC (rev 4430)
@@ -20,7 +20,14 @@
 /* Plugin tmpl version 5 */
 
 #include <rawstudio.h>
+#include <config.h>
+#if defined(HAVE_LCMS2)
+#include <lcms2.h>
+#elif defined(HAVE_LCMS)
 #include <lcms.h>
+#else
+#error "LCMS v1 or LCMS v2 required"
+#endif
 #include "rs-cmm.h"
 #include "colorspace_transform.h"
 
@@ -567,4 +574,4 @@
        return FALSE;
 }
 
-#endif
\ No newline at end of file
+#endif

Modified: trunk/plugins/colorspace-transform/colorspace_transform_sse2.c
===================================================================
--- trunk/plugins/colorspace-transform/colorspace_transform_sse2.c      
2014-02-09 18:46:49 UTC (rev 4429)
+++ trunk/plugins/colorspace-transform/colorspace_transform_sse2.c      
2014-10-14 20:54:21 UTC (rev 4430)
@@ -20,7 +20,14 @@
 /* Plugin tmpl version 5 */
 
 #include <rawstudio.h>
+#include <config.h>
+#if defined(HAVE_LCMS2)
+#include <lcms2.h>
+#elif defined(HAVE_LCMS)
 #include <lcms.h>
+#else
+#error "LCMS v1 or LCMS v2 required"
+#endif
 #include "rs-cmm.h"
 #include "colorspace_transform.h"
 
@@ -567,4 +574,4 @@
        return FALSE;
 }
 
-#endif
\ No newline at end of file
+#endif

Modified: trunk/src/gtk-helper.c
===================================================================
--- trunk/src/gtk-helper.c      2014-02-09 18:46:49 UTC (rev 4429)
+++ trunk/src/gtk-helper.c      2014-10-14 20:54:21 UTC (rev 4430)
@@ -31,7 +31,14 @@
 #include "gtk-helper.h"
 #include "rs-preview-widget.h"
 #include <gettext.h>
+#include <config.h>
+#if defined(HAVE_LCMS2)
+#include <lcms2.h>
+#elif defined(HAVE_LCMS)
 #include <lcms.h>
+#else
+#error "LCMS v1 or LCMS v2 required"
+#endif
 
 struct _RS_CONFBOX
 {


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit