← Back to branch summary

~ubuntu-branches/ubuntu/saucy/f-spot/saucy

« back to all changes in this revision

Viewing changes to src/XmpTagsImporter.cs

  • Committer: Bazaar Package Importer
  • Author(s): Iain Lane
  • Date: 2010-05-24 10:35:57 UTC
  • mfrom: (2.4.7 experimental)
  • Revision ID: james.westby@ubuntu.com-20100524103557-1j0i8f66caybci2n
Tags: 0.7.0-1
http://bugs.debian.org/559745
http://bugs.debian.org/559080
http://bugs.debian.org/492658
http://bugs.debian.org/341790
http://bugs.debian.org/357811
http://bugs.debian.org/426017
http://bugs.debian.org/584215
https://launchpad.net/bugs/586132
* New upstream release 0.7.0
 + First release of the unstable 0.7 development series. Massive changes.
 + Reparenting and detaching support (Anton Keks) (Closes: #559745)
 + A new Mallard-based documentation (Harold Schreckengost)
 + No longer embeds flickrnet, uses distribution copy (Iain Lane)
 + Adoption of a large amount of Hyena functionality (Paul Lange, Peter
   Goetz)
 + No longer embeds gnome-keyring-sharp
 + Completely rewritten import, much faster and less memory hungry (Ruben
   Vermeersch) (Closes: #559080, #492658, #341790, #357811, #426017) (LP:
   #412091)
 + No longer use gphoto2-sharp, now uses gvfs which is less crash-pron
   (Ruben Vermeersch)
 + Fix Facebook support (Ruben Vermeersch)
 + Modernized unit tests
 + Revamped build (Mike Gemünde)
 + Much improved duplicate detection (much faster too) (Ruben Vermeersch)
 + Mouse selection in Iconview (Vincent Pomey)
 + Image panning support using middle mouse button (Wojciech Dzierżanowski)
 + Timeline slider now restricted to the size of the window (Iain Churcher)
 + Over 100 bugs closed (http://bit.ly/cyVjnD)
   - No more warnings about schema defaults (Closes: #584215) (LP: #586132)
* debian/control: Clean up build deps to match configure checks
* debian/rules: Don't run dh_makeshilbs as we don't ship any shared
  libraries. There are some private ones though, which get picked up and
  result in a useless postinst/postrm call to ldconfig. Thanks, lintian.
* debian/patches/debian_fix-distclean.patch,
  debian/patches/debian_fix_f-spot.exe.config.patch,
  debian/patches/debian_link-system-flickrnet.patch,
  debian/patches/debian_link-system-gnome-keyring.patch,
  debian/patches/debian_disable-unit-tests,
  debian/patches/git_transition_duration.patch,
  debian/patches/ubuntu_fix_folder_export_hang.patch:
  Clean up obsolete patches which are no longer necessary 
* debian/patches/*: Temporarily disable patches which originated from Ubuntu
  and no longer apply cleanly. We will get these back in a future upstream
  development release.
* debian/patches/*: Refresh to apply cleanly 
* debian/rules: Add new include dir to autoreconf call to pick up f-spot
  macros 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/XmpTagsImporter.cs
18
18
using SemWeb;
19
19
using SemWeb.Util;
20
20
using Mono.Unix;
21
 
using FSpot.Utils;
 
21
using Hyena;
22
22
 
23
23
namespace FSpot.Xmp {
24
24
        internal class XmpTagsImporter {
200
200
                                                        tmp_ui = System.Convert.ToUInt32 (l.Value);
201
201
                                                } catch {
202
202
                                                        // Set rating to 0, and continue
203
 
                                                        Log.Debug ("Found illegal rating >{0}< in predicate {1}. Rating cleared",
 
203
                                                        Log.DebugFormat ("Found illegal rating >{0}< in predicate {1}. Rating cleared",
204
204
                                                                                 l.Value, stmt.Predicate.Uri);
205
205
                                                        tmp_ui = 0;
206
206
                                                }
271
271
#endif
272
272
                }
273
273
                
274
 
                public bool Import (Photo photo, string path, string orig_path)
 
274
                public bool Import (Photo photo, SafeUri uri, SafeUri orig_uri)
275
275
                {
276
276
                        XmpFile xmp;
277
277
                        
 
278
                        string path = uri.AbsolutePath;
 
279
                        string orig_path = orig_uri.AbsolutePath;
 
280
 
278
281
                        string source_sidecar = String.Format ("{0}{1}{2}.xmp",
279
282
                                                               Path.GetDirectoryName (orig_path),
280
283
                                                               Path.DirectorySeparatorChar,
293
296
                                xmp = new XmpFile ();
294
297
                        }
295
298
                        
296
 
                        using (ImageFile img = ImageFile.Create (path)) {
 
299
                        using (ImageFile img = ImageFile.Create (uri)) {
297
300
                                StatementSource source = img as StatementSource;
298
301
                                if (source != null) {
299
302
                                        try {