[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=aa7e277

The following commit has been merged in the master branch:
commit aa7e277dbc612e22cabeac3362ecab50e06ae801
Author: Robin Mills <robin at clanmills.com>
Date:   Fri Mar 18 20:31:04 2016 +0000

    #1169.  Fixing issues concerning msvc2005/EXV_UNICODE_PATH
---
 include/exiv2/exv_msvc.h | 2 +-
 msvc2005/ReadMe.txt      | 6 ++++++
 src/actions.cpp          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/include/exiv2/exv_msvc.h b/include/exiv2/exv_msvc.h
index 167a8ab..0c86fc1 100644
--- a/include/exiv2/exv_msvc.h
+++ b/include/exiv2/exv_msvc.h
@@ -131,7 +131,7 @@ typedef int pid_t;
 #define EXV_SEPARATOR_CHR '\'
 
 /* Windows unicode path support */
-// #define EXV_UNICODE_PATH
+// #define EXV_UNICODE_PATH 1
 
 /* Define to 1 if you have the `mmap' function. */
 /* #undef EXV_HAVE_MMAP */
diff --git a/msvc2005/ReadMe.txt b/msvc2005/ReadMe.txt
index af5cd0e..1da55fc 100644
--- a/msvc2005/ReadMe.txt
+++ b/msvc2005/ReadMe.txt
@@ -25,6 +25,7 @@ T A B L E  o f  C O N T E N T S
 1.5  Building with exiv2-webready.sln
 1.6  What is build
 1.7  Express editions of Visual Studio (or 32 bit only builds, or 64 bit only builds)
+1.8  UNICODE Path support
 
 2    Design
 2.1  Architecture
@@ -207,6 +208,11 @@ T A B L E  o f  C O N T E N T S
 
      To remove the "memory" of old configurations:
      setbuild.py reset
+     
+1.8  UNICODE PATH Support
+     Edit the file include/exiv2/exv_msvc.h to set the appropriate flag.
+     
+     #define EXV_UNICODE_PATH 1
 
 2    Design
 
diff --git a/src/actions.cpp b/src/actions.cpp
index f5c563d..78247f8 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -2040,7 +2040,7 @@ namespace {
             FILE* f = ::fopen(target.c_str(),"rb") ;
             if (  f ) {
                 char buffer[8*1024];
-                int n = 1 ;
+                size_t n = 1 ;
                 while ( !feof(f) && n > 0) {
                     n=fread(buffer,1,sizeof buffer,f);
                     fwrite(buffer,1,n,stdout);

-- 
exiv2 packaging