[f-spot/rubenv-gsoc-2009: 10/86] Successfully loads thumbnails from .CR2 and .DNG files now, using LibRaw.

[Ruben Vermeersch <rubenv src gnome org>]

commit b243f0e1e25fc7b90125b72228aa765869156418
Author: Ruben Vermeersch <ruben savanne be>
Date:   Sat Jul 18 19:49:04 2009 +0200

    Successfully loads thumbnails from .CR2 and .DNG files now, using LibRaw.
    
    Awesometastic!

 configure.ac                                       |    1 +
 lib/libfspotraw-sharp/.gitignore                   |    1 +
 lib/libfspotraw-sharp/Makefile.am                  |   25 ++++++++++---------
 ....dll.config => libfspotraw-sharp.dll.config.in} |    2 +-
 src/Loaders/LibrawImageLoader.cs                   |    6 ++--
 5 files changed, 19 insertions(+), 16 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8a2d833..265388a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -356,6 +356,7 @@ lib/gtk-sharp-beans/Makefile
 lib/libfspot/Makefile
 lib/libfspotraw/Makefile
 lib/libfspotraw-sharp/Makefile
+lib/libfspotraw-sharp/libfspotraw-sharp.dll.config
 lib/libgphoto2-sharp/Makefile
 lib/libgphoto2-sharp/libgphoto2-sharp.dll.config
 lib/libgphoto2-sharp/glue/Makefile
diff --git a/lib/libfspotraw-sharp/.gitignore b/lib/libfspotraw-sharp/.gitignore
index 2b415f2..59228e3 100644
--- a/lib/libfspotraw-sharp/.gitignore
+++ b/lib/libfspotraw-sharp/.gitignore
@@ -4,3 +4,4 @@
 /libfspotraw-api.*
 /*.dll
 /*.dll.mdb
+/libfspotraw-sharp.dll.config
diff --git a/lib/libfspotraw-sharp/Makefile.am b/lib/libfspotraw-sharp/Makefile.am
index 53bb790..9f044a5 100644
--- a/lib/libfspotraw-sharp/Makefile.am
+++ b/lib/libfspotraw-sharp/Makefile.am
@@ -32,20 +32,21 @@ libfspotraw-sharp.dll: generated/LibrawLoader.cs $(SRCS)
 	$(CSC) -target:library -out:$@ $(UNSAFE) $(DEBUG) $(ASSEMBLIES) $(SRCS) generated/*.cs
 
 assemblydir = $(pkglibdir)
-assembly_DATA =			\
-	libfspotraw-sharp.dll		\
+assembly_DATA =						\
+	libfspotraw-sharp.dll			\
 	libfspotraw-sharp.dll.config
 
-CLEANFILES = 			\
-	generated/*.cs 		\
-	libfspotraw-api.raw	\
-	libfspotraw-sharp.dll 	\
-	libfspotraw-sharp.dll.mdb \
+CLEANFILES = 						\
+	generated/*.cs 					\
+	libfspotraw-api.raw				\
+	libfspotraw-sharp.dll 			\
+	libfspotraw-sharp.dll.mdb 		\
+	libfspotraw-sharp.dll.config	\
 	libfspotraw-api.xml
 
-EXTRA_DIST =			\
-	$(SRCS)			\
-	$(CUSTOMS)		\
-	libfspotraw.metadata		\
-	libfspotraw-sharp.dll.config	\
+EXTRA_DIST =						\
+	$(SRCS)							\
+	$(CUSTOMS)						\
+	libfspotraw.metadata			\
+	libfspotraw-sharp.dll.config.in	\
 	libfspotraw-api.raw
diff --git a/lib/libfspotraw-sharp/libfspotraw-sharp.dll.config b/lib/libfspotraw-sharp/libfspotraw-sharp.dll.config.in
similarity index 85%
rename from lib/libfspotraw-sharp/libfspotraw-sharp.dll.config
rename to lib/libfspotraw-sharp/libfspotraw-sharp.dll.config.in
index d1514c0..61cb2b0 100644
--- a/lib/libfspotraw-sharp/libfspotraw-sharp.dll.config
+++ b/lib/libfspotraw-sharp/libfspotraw-sharp.dll.config.in
@@ -6,5 +6,5 @@
   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>
   <dllmap dll="libgdk-win32-2.0-0.dll" target="libgdk-x11-2.0.so.0"/>
   <dllmap dll="libgdk_pixbuf-2.0-0.dll" target="libgdk_pixbuf-2.0.so.0"/>
-  <dllmap dll="libfspotraw.dll" target="libfspotraw.so"/>
+  <dllmap dll="libfspotraw.dll" target="@expanded_libdir@/f-spot/libfspotraw.so.0"/>
 </configuration>
diff --git a/src/Loaders/LibrawImageLoader.cs b/src/Loaders/LibrawImageLoader.cs
index 87f9a7d..d554321 100644
--- a/src/Loaders/LibrawImageLoader.cs
+++ b/src/Loaders/LibrawImageLoader.cs
@@ -34,12 +34,14 @@ namespace FSpot.Loaders {
 
 			Pixbuf thumb = loader.LoadThumbnail ();
 			PixbufOrientation = PixbufOrientation.TopLeft;
+			Pixbuf = thumb;
 			EventHandler<AreaPreparedEventArgs> prep = AreaPrepared;
 			if (prep != null)
 				prep (this, new AreaPreparedEventArgs (true));
 			EventHandler<AreaUpdatedEventArgs> upd = AreaUpdated;
 			if (upd != null)
 				upd (this, new AreaUpdatedEventArgs (new Rectangle (0, 0, thumb.Width, thumb.Height)));
+
 		}
 
 		public event EventHandler<AreaPreparedEventArgs> AreaPrepared;
@@ -55,9 +57,7 @@ namespace FSpot.Loaders {
 
 		}
 
-		public Pixbuf Pixbuf {
-			get { throw new Exception ("Not implemented yet!"); }
-		}
+		public Pixbuf Pixbuf { get; private set; }
 
 		public PixbufOrientation PixbufOrientation { get; private set; }
 	}