head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.6
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.4
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.2
	pkgsrc-2011Q4-base:1.2;
locks; strict;
comment	@# @;


1.2
date	2011.09.12.18.15.03;	author drochner;	state dead;
branches;
next	1.1;

1.1
date	2011.07.31.17.37.01;	author gls;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 0.11.1
changes:
-Tags can now be organized into hierarchical trees
-Paired RAW + JPEG images are treated as a single photo when imported
 from a camera
-Select different developers for RAW photos: use the development produced
 by Shotwell or by your camera
-Shotwell now uses GSettings instead of GConf to store its
 configuration information
-"Hide Photos Already Imported" setting persists between imports
-Several all-new saved search options
-JPEG mimics of RAW images are no longer stored in your home directory,
 and are now created on demand
-Shotwell now supports Windows Bitmap (.bmp) images
@
text
@$NetBSD: patch-src_photos_GRaw.vala,v 1.1 2011/07/31 17:37:01 gls Exp $

Fix importing with libraw 0.13.6 & 0.13.7
Taken from upstream: http://redmine.yorba.org/issues/3868

--- src/photos/GRaw.vala.orig	2011-05-26 23:43:17.000000000 +0000
+++ src/photos/GRaw.vala
@@@@ -110,8 +110,8 @@@@ public class ProcessedImage {
     }
     
     public ProcessedImage(LibRaw.Processor proc) throws Exception {
-        LibRaw.Result result;
-        image = proc.make_mem_image(out result);
+        LibRaw.Result result = LibRaw.Result.SUCCESS;
+        image = proc.make_mem_image(ref result);
         throw_exception("ProcessedImage", result);
         assert(image != null);
         
@@@@ -122,8 +122,8 @@@@ public class ProcessedImage {
     }
     
     public ProcessedImage.from_thumb(LibRaw.Processor proc) throws Exception {
-        LibRaw.Result result;
-        image = proc.make_mem_thumb(out result);
+        LibRaw.Result result = LibRaw.Result.SUCCESS;
+        image = proc.make_mem_thumb(ref result);
         throw_exception("ProcessedImage.from_thumb", result);
         assert(image != null);
         
@@@@ -280,7 +280,7 @@@@ private void throw_exception(string call
     if (result == LibRaw.Result.SUCCESS)
         return;
     else if (result > 0)
-        throw new Exception.SYSTEM_ERROR("System error %d: %s", (int) result, strerror(result));
+        throw new Exception.SYSTEM_ERROR("%s: System error %d: %s", caller, (int) result, strerror(result));
     
     string msg = "%s: %s".printf(caller, result.to_string());
     
@


1.1
log
@Add two patches from upstream to fix importing raws with libraw 0.13.6 and 0.13.7
PKGREV++
@
text
@d1 1
a1 1
$NetBSD$
@