From 75cdbc8b91a82f3bb05c02adf8191e4d5f09b7e0 Mon Sep 17 00:00:00 2001 From: tbeu Date: Fri, 3 Nov 2017 20:57:24 +0100 Subject: [PATCH] Use pre-increment on iterators V803 Decreased performance. In case 'userEnd' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. futils.cpp 405 V803 Decreased performance. In case 'authEnd' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. futils.cpp 410 V803 Decreased performance. In case 'hostEnd' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. futils.cpp 428 V803 Decreased performance. In case 'e' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. epsimage.cpp 711 V803 Decreased performance. In case 'e' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. epsimage.cpp 841 V803 Decreased performance. In case 'e' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. epsimage.cpp 958 V803 Decreased performance. In case 'i' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. epsimage.cpp 855 V803 Decreased performance. In case 'it' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. jpgimage.cpp 817 V803 Decreased performance. In case 'lib' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. version.cpp 508 V803 Decreased performance. In case 'it' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. version.cpp 563 V803 Decreased performance. In case 'it' is iterator it's more effective to use prefix form of increment. Replace iterator++ with ++iterator. xmpsidecar.cpp 138 --- src/epsimage.cpp | 8 ++++---- src/futils.cpp | 6 +++--- src/jpgimage.cpp | 2 +- src/version.cpp | 4 ++-- src/xmpsidecar.cpp | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/epsimage.cpp b/src/epsimage.cpp index d70984ce..2ac06227 100644 --- a/src/epsimage.cpp +++ b/src/epsimage.cpp @@ -704,7 +704,7 @@ namespace { findXmp(posOtherXmp, sizeOtherXmp, data, posOtherXmp + sizeOtherXmp, posEndPageSetup, write); if (posOtherXmp >= posEndPageSetup) break; bool isRemovableEmbedding = false; - for (std::vector >::const_iterator e = removableEmbeddings.begin(); e != removableEmbeddings.end(); e++) { + for (std::vector >::const_iterator e = removableEmbeddings.begin(); e != removableEmbeddings.end(); ++e) { if (e->first <= posOtherXmp && posOtherXmp < e->second) { isRemovableEmbedding = true; break; @@ -834,7 +834,7 @@ namespace { if (useFlexibleEmbedding) { positions.push_back(xmpPos); } - for (std::vector >::const_iterator e = removableEmbeddings.begin(); e != removableEmbeddings.end(); e++) { + for (std::vector >::const_iterator e = removableEmbeddings.begin(); e != removableEmbeddings.end(); ++e) { positions.push_back(e->first); } std::sort(positions.begin(), positions.end()); @@ -848,7 +848,7 @@ namespace { const uint32_t posEpsNew = posTemp(*tempIo); size_t prevPos = posEps; size_t prevSkipPos = prevPos; - for (std::vector::const_iterator i = positions.begin(); i != positions.end(); i++) { + for (std::vector::const_iterator i = positions.begin(); i != positions.end(); ++i) { const size_t pos = *i; if (pos == prevPos) continue; #ifdef DEBUG @@ -951,7 +951,7 @@ namespace { } if (!useFlexibleEmbedding) { // remove preceding embedding(s) - for (std::vector >::const_iterator e = removableEmbeddings.begin(); e != removableEmbeddings.end(); e++) { + for (std::vector >::const_iterator e = removableEmbeddings.begin(); e != removableEmbeddings.end(); ++e) { if (pos == e->first) { skipPos = e->second; #ifdef DEBUG diff --git a/src/futils.cpp b/src/futils.cpp index 525c4185..0ea78113 100644 --- a/src/futils.cpp +++ b/src/futils.cpp @@ -411,12 +411,12 @@ namespace Exiv2 { iterator_t userEnd = std::find(authStart, authEnd, ':'); if (userEnd != authEnd) { result.Username = std::string(userStart, userEnd); - userEnd++; + ++userEnd; result.Password = std::string(userEnd, authEnd); } else { result.Username = std::string(authStart, authEnd); } - authEnd++; + ++authEnd; } else { authEnd = protocolEnd; } @@ -434,7 +434,7 @@ namespace Exiv2 { // port if ((hostEnd != uriEnd) && ((&*(hostEnd))[0] == ':')) // we have a port { - hostEnd++; + ++hostEnd; iterator_t portEnd = (pathStart != uriEnd) ? pathStart : queryStart; result.Port = std::string(hostEnd, portEnd); } diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp index d4dd704d..7a181f1e 100644 --- a/src/jpgimage.cpp +++ b/src/jpgimage.cpp @@ -842,7 +842,7 @@ namespace Exiv2 { bool bOdd = (i % 2) != 0; bool bEven = !bOdd; pos[i + 1] = bEven ? *it : pos[i] + *it; - it++; + ++it; } pos[count + 1] = io_->size() - pos[count]; #ifdef DEBUG diff --git a/src/version.cpp b/src/version.cpp index 362c5b30..81a38f3d 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -479,7 +479,7 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys) output(os,keys,"curl" , use_curl); if ( libs.begin() != libs.end() ) { output(os,keys,"executable" ,*libs.begin()); - for ( Exiv2::StringVector_i lib = libs.begin()+1 ; lib != libs.end() ; lib++ ) + for ( Exiv2::StringVector_i lib = libs.begin()+1 ; lib != libs.end() ; ++lib ) output(os,keys,"library",*lib); } @@ -530,7 +530,7 @@ void Exiv2::dumpLibraryInfo(std::ostream& os,const exv_grep_keys_t& keys) Exiv2::Dictionary ns; Exiv2::XmpProperties::registeredNamespaces(ns); - for ( Exiv2::Dictionary_i it = ns.begin(); it != ns.end() ; it++ ) { + for ( Exiv2::Dictionary_i it = ns.begin(); it != ns.end() ; ++it ) { std::string xmlns = (*it).first; std::string uri = (*it).second; output(os,keys,name,xmlns+":"+uri); diff --git a/src/xmpsidecar.cpp b/src/xmpsidecar.cpp index ba298640..de293e04 100644 --- a/src/xmpsidecar.cpp +++ b/src/xmpsidecar.cpp @@ -131,7 +131,7 @@ namespace Exiv2 { copyIptcToXmp(iptcData_, xmpData_); // #1112 - restore dates if they lost their TZ info - for ( Exiv2::Dictionary_i it = dates_.begin() ; it != dates_.end() ; it++) { + for ( Exiv2::Dictionary_i it = dates_.begin() ; it != dates_.end() ; ++it ) { std::string sKey = it->first; Exiv2::XmpKey key(sKey); if ( xmpData_.findKey(key) != xmpData_.end() ) {