move ICC validity check to InitDerivedMetaDataProperties

Author: Johannes Bildstein

src/ImageSharp/Formats/Jpeg/GolangPort/GolangJpegDecoderCore.cs

@@ -413,11 +413,6 @@ public void ParseStream(Stream stream, bool metadataOnly = false)
             }
 
             this.InitDerivedMetaDataProperties();
-
-            if (this.MetaData.IccProfile?.CheckIsValid() == false)
-            {
-                this.MetaData.IccProfile = null;
-            }
         }
 
         /// <summary>
@@ -455,6 +450,11 @@ private void InitDerivedMetaDataProperties()
                     this.MetaData.VerticalResolution = verticalValue;
                 }
             }
+
+            if (this.MetaData.IccProfile?.CheckIsValid() == false)
+            {
+                this.MetaData.IccProfile = null;
+            }
         }
 
         /// <summary>

src/ImageSharp/Formats/Jpeg/PdfJsPort/PdfJsJpegDecoderCore.cs

@@ -196,7 +196,7 @@ public Image<TPixel> Decode<TPixel>(Stream stream)
             where TPixel : struct, IPixel<TPixel>
         {
             this.ParseStream(stream);
-            this.AssignResolution();
+            this.InitDerivedMetaDataProperties();
             return this.PostProcessIntoImage<TPixel>();
         }
 
@@ -207,7 +207,7 @@ public Image<TPixel> Decode<TPixel>(Stream stream)
         public IImageInfo Identify(Stream stream)
         {
             this.ParseStream(stream, true);
-            this.AssignResolution();
+            this.InitDerivedMetaDataProperties();
             return new ImageInfo(new PixelTypeInfo(this.BitsPerPixel), this.ImageWidth, this.ImageHeight, this.MetaData);
         }
 
@@ -266,7 +266,7 @@ public void ParseStream(Stream stream, bool metadataOnly = false)
                             {
                                 // It's highly unlikely that APPn related data will be found after the SOS marker
                                 // We should have gathered everything we need by now.
-                                break;
+                                return;
                             }
 
                         case JpegConstants.Markers.DHT:
@@ -345,11 +345,6 @@ public void ParseStream(Stream stream, bool metadataOnly = false)
                 // Read on.
                 fileMarker = FindNextFileMarker(this.markerBuffer, this.InputStream);
             }
-
-            if (this.MetaData.IccProfile?.CheckIsValid() == false)
-            {
-                this.MetaData.IccProfile = null;
-            }
         }
 
         /// <inheritdoc/>
@@ -400,9 +395,9 @@ private JpegColorSpace DeduceJpegColorSpace()
         }
 
         /// <summary>
-        /// Assigns the horizontal and vertical resolution to the image if it has a JFIF header or EXIF metadata.
+        /// Assigns derived metadata properties to <see cref="MetaData"/>, eg. horizontal and vertical resolution if it has a JFIF header.
         /// </summary>
-        private void AssignResolution()
+        private void InitDerivedMetaDataProperties()
         {
             if (this.jFif.XDensity > 0 && this.jFif.YDensity > 0)
             {
@@ -425,6 +420,11 @@ private void AssignResolution()
                     this.MetaData.VerticalResolution = verticalValue;
                 }
             }
+
+            if (this.MetaData.IccProfile?.CheckIsValid() == false)
+            {
+                this.MetaData.IccProfile = null;
+            }
         }
 
         /// <summary>