From 6aa2c3ce4ca022c45ae22a48c9c5151d437c6e73 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 24 Jul 2012 17:09:36 +0100 Subject: Add libjpeg to install. --- windows/installer.nsi.in | 1 + 1 file changed, 1 insertion(+) diff --git a/windows/installer.nsi.in b/windows/installer.nsi.in index 980cc379e..d0dd508e7 100644 --- a/windows/installer.nsi.in +++ b/windows/installer.nsi.in @@ -71,6 +71,7 @@ File "bin/postproc-52.dll" File "bin/swresample-0.dll" File "bin/swscale-2.dll" File "bin/zlib1.dll" +File "bin/libjpeg-8.dll" CreateDirectory "$INSTDIR\etc\gtk-2.0" SetOutPath "$INSTDIR\etc\gtk-2.0" -- cgit v1.2.3 From bfde7a8618e9cd3180c38142ff26e251e37d8502 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 24 Jul 2012 17:09:45 +0100 Subject: Fix bad access of content path. --- src/lib/film_state.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc index ae70b53bd..343e9ebb4 100644 --- a/src/lib/film_state.cc +++ b/src/lib/film_state.cc @@ -168,7 +168,7 @@ FilmState::read_metadata (string k, string v) /* Itsy bitsy hack: compute digest here if don't have one (for backwards compatibility) */ if (content_digest.empty() && !content.empty()) { - content_digest = md5_digest (file (content)); + content_digest = md5_digest (content_path ()); } } -- cgit v1.2.3