head	1.2;
access;
symbols
	pkgsrc-2014Q1:1.1.0.26
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.24
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.22
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.20
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.18
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.16
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.14
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.12
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.10
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.8
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.6
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.4
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.2
	pkgsrc-2011Q1-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2014.06.05.06.43.54;	author adam;	state dead;
branches;
next	1.1;
commitid	YE3JSNbtfiLGFiDx;

1.1
date	2011.02.28.20.37.56;	author adam;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Changes 0.24:
Exiv2 introduces its first support for Video metadata. Many more cameras and accessories are now recognised. Numerous bugs fixes, build and test improvments.
@
text
@$NetBSD: patch-contrib_organize_organize.cpp,v 1.1 2011/02/28 20:37:56 adam Exp $

--- contrib/organize/organize.cpp.orig	2011-02-28 19:45:54.000000000 +0000
+++ contrib/organize/organize.cpp
@@@@ -568,8 +568,8 @@@@ boost::regex uregex("(.*?)\\(([[:digit:]
 
 fs::path uniquify(const fs::path &dest)
 {
-    std::string ext = dest.extension();
-    std::string fname = dest.stem();
+    std::string ext = dest.extension().file_string();
+    std::string fname = dest.stem().file_string();
     fs::path parent = dest.parent_path();
 
     unsigned number = 1;
@@@@ -658,7 +658,7 @@@@ void process_directory(const fs::path &d
                         ++params.unsorted_count;
                     }
             
-                    dest_file /= p_iter->filename();
+                    dest_file /= p_iter->path();
                 
                     if(fs::exists(dest_file)) {
                         if(params.ignore_dups) {
@@@@ -682,7 +682,7 @@@@ void process_directory(const fs::path &d
                             else {
                                 info(std::string("duplicate file: ") + p_iter->path().file_string() +
                                     " of: " +  dest_file.file_string());
-                                dest_file = params.dups_dir / dest_subdir / p_iter->filename();
+                                dest_file = params.dups_dir / dest_subdir / p_iter->path();
                                 // Ugh, more dup possibilities
                                 if(fs::exists(dest_file)) {
                                     info(std::string("renaming: ") + p_iter->path().file_string() +
@


1.1
log
@Fix building with Clang and/or Boost 1.46.0
@
text
@d1 1
a1 1
$NetBSD$
@