From ad7c93da67eff5467e717b1a27771caa01142c61 Mon Sep 17 00:00:00 2001
From: Oliver Duis <oduis@hotmail.com>
Date: Sat, 2 Apr 2011 11:25:24 +0200
Subject: [PATCH] Compilation fix for LCMS2 on behalf of Jacques; see issue
 #612

---
 rtengine/iccstore.h       | 2 +-
 rtengine/iimage.h         | 3 +--
 rtengine/image8.cc        | 2 +-
 rtengine/rawimagesource.h | 3 +--
 rtengine/rtengine.h       | 2 +-
 rtengine/rtthumbnail.cc   | 2 +-
 rtengine/rtthumbnail.h    | 2 +-
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/rtengine/iccstore.h b/rtengine/iccstore.h
index 523c0ebd3..1f0751c99 100644
--- a/rtengine/iccstore.h
+++ b/rtengine/iccstore.h
@@ -19,7 +19,7 @@
 #ifndef __ICCSTORE__                         
 #define __ICCSTORE__
 
-#include <lcms2_plugin.h>
+#include <lcms2.h>
 #include <glibmm.h>
 #include <map>
 #include <string>
diff --git a/rtengine/iimage.h b/rtengine/iimage.h
index a9b298846..f783d715d 100644
--- a/rtengine/iimage.h
+++ b/rtengine/iimage.h
@@ -18,8 +18,7 @@
  */
 #ifndef _IIMAGE_
 #define _IIMAGE_
-
-#include <lcms2_plugin.h>
+#include <lcms2.h>
 #include <glibmm.h>
 
 namespace rtengine {
diff --git a/rtengine/image8.cc b/rtengine/image8.cc
index b27bf4067..793ce536b 100644
--- a/rtengine/image8.cc
+++ b/rtengine/image8.cc
@@ -18,7 +18,7 @@
  */
 #include <image8.h>
 #include <rtengine.h>
-
+#include <memory.h>
 using namespace rtengine;
 
 
diff --git a/rtengine/rawimagesource.h b/rtengine/rawimagesource.h
index 5dca6d78a..0e4076d13 100644
--- a/rtengine/rawimagesource.h
+++ b/rtengine/rawimagesource.h
@@ -20,8 +20,7 @@
 #define _RAWIMAGESOURCE_
 
 #include <imagesource.h>
-#include <lcms2_plugin.h>
-
+#include <lcms2.h>
 #define HR_SCALE 2
 
 namespace rtengine {
diff --git a/rtengine/rtengine.h b/rtengine/rtengine.h
index 38e05bb50..d18d34fdd 100644
--- a/rtengine/rtengine.h
+++ b/rtengine/rtengine.h
@@ -21,7 +21,7 @@
 
 #include <procparams.h>
 #include <procevents.h>
-#include <lcms2_plugin.h>
+#include <lcms2.h>
 #include <string>
 #include <glibmm.h>
 #include <time.h>
diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
index 510bd44b9..4424ad976 100644
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -19,7 +19,7 @@
 #include <rtengine.h>
 #include <rtthumbnail.h>
 #include <image8.h>
-#include <lcms2_plugin.h>
+#include <lcms2.h>
 #include <curves.h>
 #include <glibmm.h>
 #include <improcfun.h>
diff --git a/rtengine/rtthumbnail.h b/rtengine/rtthumbnail.h
index 1cc8a09de..d2dea16ec 100644
--- a/rtengine/rtthumbnail.h
+++ b/rtengine/rtthumbnail.h
@@ -22,7 +22,7 @@
 #include <rawmetadatalocation.h>
 #include <procparams.h>
 #include <glibmm.h>
-#include <lcms2_plugin.h>
+#include <lcms2.h>
 #include <image16.h>
 
 namespace rtengine {