From 7383d96d47e64800051237bec414d41047d2aa86 Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 31 May 2020 10:22:46 +0100 Subject: [PATCH 1/2] Fix compiler error when using EXIV2_DEBUG_MESSAGES. --- src/pngimage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pngimage.cpp b/src/pngimage.cpp index 72a2b0fe11..594df90867 100644 --- a/src/pngimage.cpp +++ b/src/pngimage.cpp @@ -350,7 +350,7 @@ namespace Exiv2 { if ( bExif || bIptc ) { DataBuf parsedBuf = PngChunk::readRawProfile(dataBuf,tEXt); #if EXIV2_DEBUG_MESSAGES - std::cerr << Exiv2::Internal::binaryToString(parsedBuf.pData_, parsedBuf.size_>50?50:parsedBuf.size_,0) << std::endl; + std::cerr << Exiv2::Internal::binaryToString(makeSlice(parsedBuf.pData_, parsedBuf.size_>50?50:parsedBuf.size_,0)) << std::endl; #endif if ( parsedBuf.size_ ) { if ( bExif ) { From 7b15178f661403376d19692eac3ed75242d3e157 Mon Sep 17 00:00:00 2001 From: clanmills Date: Sun, 31 May 2020 10:27:53 +0100 Subject: [PATCH 2/2] Dump revision number. --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0f160079c7..1754e0f711 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,12 @@ cmake_minimum_required( VERSION 3.3.2 ) project(exiv2 # use TWEAK to categorize the build - VERSION 0.27.3.20 # 0.27.3 = GM + VERSION 0.27.3.2 # 0.27.3 = GM # 0.27.3.00 = GM Preview # 0.27.3.09 = Not For Release - # 0.27.3.1 = RC1 - # 0.27.3.10 = RC1 Preview - # 0.27.3.19 = RC1 Not for release + # 0.27.3.2 = RC2 + # 0.27.3.20 = RC2 Preview + # 0.27.3.29 = RC2 Not for release LANGUAGES CXX C ) include(cmake/mainSetup.cmake REQUIRED)