Put setting JpegColorType and ColorSpace close together

ynse01 · ynse01 · commit 4d0fb4070a71 · 2021-03-30T22:00:04.000+02:00
diff --git a/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs b/src/ImageSharp/Formats/Jpeg/JpegDecoderCore.cs
@@ -912,6 +912,7 @@ private void ProcessStartOfFrameMarker(BufferedReadStream stream, int remaining,
                 this.Frame.MaxHorizontalFactor = maxH;
                 this.Frame.MaxVerticalFactor = maxV;
                 this.ColorSpace = this.DeduceJpegColorSpace();
+                this.Metadata.GetJpegMetadata().ColorType = this.ColorSpace == JpegColorSpace.Grayscale ? JpegColorType.Luminance : JpegColorType.YCbCr;
                 this.Frame.InitComponents();
                 this.ImageSizeInMCU = new Size(this.Frame.McusPerLine, this.Frame.McusPerColumn);
             }
@@ -1038,8 +1039,6 @@ private void ProcessStartOfScanMarker(BufferedReadStream stream, CancellationTok
                 this.Frame.ComponentOrder[i] = (byte)componentIndex;
             }
 
-            this.Metadata.GetJpegMetadata().ColorType = (selectorsCount == 1) ? JpegColorType.Luminance : JpegColorType.YCbCr;
-
             stream.Read(this.temp, 0, 3);
 
             int spectralStart = this.temp[0];

Original file line number	Diff line number	Diff line change
`@@ -912,6 +912,7 @@ private void ProcessStartOfFrameMarker(BufferedReadStream stream, int remaining,`
`912`	`912`	`this.Frame.MaxHorizontalFactor = maxH;`
`913`	`913`	`this.Frame.MaxVerticalFactor = maxV;`
`914`	`914`	`this.ColorSpace = this.DeduceJpegColorSpace();`
	`915`	`+ this.Metadata.GetJpegMetadata().ColorType = this.ColorSpace == JpegColorSpace.Grayscale ? JpegColorType.Luminance : JpegColorType.YCbCr;`
`915`	`916`	`this.Frame.InitComponents();`
`916`	`917`	`this.ImageSizeInMCU = new Size(this.Frame.McusPerLine, this.Frame.McusPerColumn);`
`917`	`918`	`}`
`@@ -1038,8 +1039,6 @@ private void ProcessStartOfScanMarker(BufferedReadStream stream, CancellationTok`
`1038`	`1039`	`this.Frame.ComponentOrder[i] = (byte)componentIndex;`
`1039`	`1040`	`}`
`1040`	`1041`
`1041`		`- this.Metadata.GetJpegMetadata().ColorType = (selectorsCount == 1) ? JpegColorType.Luminance : JpegColorType.YCbCr;`
`1042`		`-`
`1043`	`1042`	`stream.Read(this.temp, 0, 3);`
`1044`	`1043`
`1045`	`1044`	`int spectralStart = this.temp[0];`