Compilation fix for LCMS2 on behalf of Jacques; see issue #612

2011-04-02 11:25:24 +02:00
parent 0de4f199f0
commit ad7c93da67
7 changed files with 7 additions and 9 deletions
--- 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>
--- 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 {
--- a/rtengine/image8.cc
+++ b/rtengine/image8.cc
@@ -18,7 +18,7 @@
 */
 #include <image8.h>
 #include <rtengine.h>
-
+#include <memory.h>
 using namespace rtengine;


--- 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 {
--- 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>
--- 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>
--- 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 {