2 files changed, 7 insertions, 10 deletions
diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp
index 1f609377f..8484984bd 100644
--- a/src/extension/internal/pdfinput/pdf-parser.cpp
+++ b/src/extension/internal/pdfinput/pdf-parser.cpp
@@ -853,8 +853,8 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
       }
       _POPPLER_FREE(obj3);
       if ((haveBackdropColor = _POPPLER_CALL_ARGS_DEREF(obj3, obj2.dictLookup, "BC").isArray())) {
-	for (int i = 0; i < gfxColorMaxComps; ++i) {
-	  backdropColor.c[i] = 0;
+	for (int & i : backdropColor.c) {
+	  i = 0;
 	}
 	for (int i = 0; i < obj3.arrayGetLength() && i < gfxColorMaxComps; ++i) {
           _POPPLER_CALL_ARGS(obj4, obj3.arrayGet, i);
@@ -893,8 +893,8 @@ void PdfParser::opSetExtGState(Object args[], int /*numArgs*/)
 	      blendingColorSpace->getDefaultColor(&backdropColor);
 	    } else {
 	      //~ need to get the parent or default color space (?)
-	      for (int i = 0; i < gfxColorMaxComps; ++i) {
-		backdropColor.c[i] = 0;
+	      for (int & i : backdropColor.c) {
+		i = 0;
 	      }
 	    }
 	  }
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 373df6a39..7247536e9 100644
--- a/src/extension/internal/pdfinput/svg-builder.cpp
+++ b/src/extension/internal/pdfinput/svg-builder.cpp
@@ -121,9 +121,8 @@ void SvgBuilder::_init() {
     // Fill _availableFontNames (Bug LP #179589) (code cfr. FontLister)
     std::vector<PangoFontFamily *> families;
     font_factory::Default()->GetUIFamilies(families);
-    for ( std::vector<PangoFontFamily *>::iterator iter = families.begin();
-          iter != families.end(); ++iter ) {
-        _availableFontNames.emplace_back(pango_font_family_get_name(*iter));
+    for (auto & familie : families) {
+        _availableFontNames.emplace_back(pango_font_family_get_name(familie));
     }
 
     _transp_group_stack = nullptr;
@@ -956,9 +955,7 @@ std::string SvgBuilder::_BestMatchingFont(std::string PDFname)
     double bestMatch = 0;
     std::string bestFontname = "Arial";
     
-    for (guint i = 0; i < _availableFontNames.size(); i++) {
-        std::string fontname = _availableFontNames[i];
-        
+    for (auto fontname : _availableFontNames) {
         // At least the first word of the font name should match.
         size_t minMatch = fontname.find(" ");
         if (minMatch == std::string::npos) {