Browse Source

fix "as" usage (#959)

pull/962/head
Simon Cropp 7 years ago
committed by James Jackson-South
parent
commit
4a55496a11
  1. 2
      src/ImageSharp/Advanced/AotCompilerTools.cs
  2. 6
      src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Curves.cs
  3. 8
      src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MultiProcessElement.cs
  4. 66
      src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.TagDataEntry.cs

2
src/ImageSharp/Advanced/AotCompilerTools.cs

@ -181,7 +181,7 @@ namespace SixLabors.ImageSharp.Advanced
where TPixel : struct, IPixel<TPixel> where TPixel : struct, IPixel<TPixel>
{ {
var resizeProcessor = new ResizeProcessor(new ResizeOptions(), default); var resizeProcessor = new ResizeProcessor(new ResizeOptions(), default);
var genericResizeProcessor = new ResizeProcessor<TPixel>(resizeProcessor.CreatePixelSpecificProcessor<TPixel>() as ResizeProcessor); var genericResizeProcessor = new ResizeProcessor<TPixel>((ResizeProcessor)resizeProcessor.CreatePixelSpecificProcessor<TPixel>());
genericResizeProcessor.AotCreateDestination(new Image<TPixel>(0, 0), default); genericResizeProcessor.AotCreateDestination(new Image<TPixel>(0, 0), default);
} }
} }

6
src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.Curves.cs

@ -1,4 +1,4 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System.Numerics; using System.Numerics;
@ -118,9 +118,9 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
switch (value.Signature) switch (value.Signature)
{ {
case IccCurveSegmentSignature.FormulaCurve: case IccCurveSegmentSignature.FormulaCurve:
return count + this.WriteFormulaCurveElement(value as IccFormulaCurveElement); return count + this.WriteFormulaCurveElement((IccFormulaCurveElement)value);
case IccCurveSegmentSignature.SampledCurve: case IccCurveSegmentSignature.SampledCurve:
return count + this.WriteSampledCurveElement(value as IccSampledCurveElement); return count + this.WriteSampledCurveElement((IccSampledCurveElement)value);
default: default:
throw new InvalidIccProfileException($"Invalid CurveSegment type of {value.Signature}"); throw new InvalidIccProfileException($"Invalid CurveSegment type of {value.Signature}");
} }

8
src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.MultiProcessElement.cs

@ -1,4 +1,4 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
namespace SixLabors.ImageSharp.Metadata.Profiles.Icc namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
@ -22,11 +22,11 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
switch (value.Signature) switch (value.Signature)
{ {
case IccMultiProcessElementSignature.CurveSet: case IccMultiProcessElementSignature.CurveSet:
return count + this.WriteCurveSetProcessElement(value as IccCurveSetProcessElement); return count + this.WriteCurveSetProcessElement((IccCurveSetProcessElement)value);
case IccMultiProcessElementSignature.Matrix: case IccMultiProcessElementSignature.Matrix:
return count + this.WriteMatrixProcessElement(value as IccMatrixProcessElement); return count + this.WriteMatrixProcessElement((IccMatrixProcessElement)value);
case IccMultiProcessElementSignature.Clut: case IccMultiProcessElementSignature.Clut:
return count + this.WriteClutProcessElement(value as IccClutProcessElement); return count + this.WriteClutProcessElement((IccClutProcessElement)value);
case IccMultiProcessElementSignature.BAcs: case IccMultiProcessElementSignature.BAcs:
case IccMultiProcessElementSignature.EAcs: case IccMultiProcessElementSignature.EAcs:

66
src/ImageSharp/MetaData/Profiles/ICC/DataWriter/IccDataWriter.TagDataEntry.cs

@ -1,4 +1,4 @@
// Copyright (c) Six Labors and contributors. // Copyright (c) Six Labors and contributors.
// Licensed under the Apache License, Version 2.0. // Licensed under the Apache License, Version 2.0.
using System.Linq; using System.Linq;
@ -37,102 +37,102 @@ namespace SixLabors.ImageSharp.Metadata.Profiles.Icc
switch (entry.Signature) switch (entry.Signature)
{ {
case IccTypeSignature.Chromaticity: case IccTypeSignature.Chromaticity:
count += this.WriteChromaticityTagDataEntry(entry as IccChromaticityTagDataEntry); count += this.WriteChromaticityTagDataEntry((IccChromaticityTagDataEntry)entry);
break; break;
case IccTypeSignature.ColorantOrder: case IccTypeSignature.ColorantOrder:
count += this.WriteColorantOrderTagDataEntry(entry as IccColorantOrderTagDataEntry); count += this.WriteColorantOrderTagDataEntry((IccColorantOrderTagDataEntry)entry);
break; break;
case IccTypeSignature.ColorantTable: case IccTypeSignature.ColorantTable:
count += this.WriteColorantTableTagDataEntry(entry as IccColorantTableTagDataEntry); count += this.WriteColorantTableTagDataEntry((IccColorantTableTagDataEntry)entry);
break; break;
case IccTypeSignature.Curve: case IccTypeSignature.Curve:
count += this.WriteCurveTagDataEntry(entry as IccCurveTagDataEntry); count += this.WriteCurveTagDataEntry((IccCurveTagDataEntry)entry);
break; break;
case IccTypeSignature.Data: case IccTypeSignature.Data:
count += this.WriteDataTagDataEntry(entry as IccDataTagDataEntry); count += this.WriteDataTagDataEntry((IccDataTagDataEntry)entry);
break; break;
case IccTypeSignature.DateTime: case IccTypeSignature.DateTime:
count += this.WriteDateTimeTagDataEntry(entry as IccDateTimeTagDataEntry); count += this.WriteDateTimeTagDataEntry((IccDateTimeTagDataEntry)entry);
break; break;
case IccTypeSignature.Lut16: case IccTypeSignature.Lut16:
count += this.WriteLut16TagDataEntry(entry as IccLut16TagDataEntry); count += this.WriteLut16TagDataEntry((IccLut16TagDataEntry)entry);
break; break;
case IccTypeSignature.Lut8: case IccTypeSignature.Lut8:
count += this.WriteLut8TagDataEntry(entry as IccLut8TagDataEntry); count += this.WriteLut8TagDataEntry((IccLut8TagDataEntry)entry);
break; break;
case IccTypeSignature.LutAToB: case IccTypeSignature.LutAToB:
count += this.WriteLutAtoBTagDataEntry(entry as IccLutAToBTagDataEntry); count += this.WriteLutAtoBTagDataEntry((IccLutAToBTagDataEntry)entry);
break; break;
case IccTypeSignature.LutBToA: case IccTypeSignature.LutBToA:
count += this.WriteLutBtoATagDataEntry(entry as IccLutBToATagDataEntry); count += this.WriteLutBtoATagDataEntry((IccLutBToATagDataEntry)entry);
break; break;
case IccTypeSignature.Measurement: case IccTypeSignature.Measurement:
count += this.WriteMeasurementTagDataEntry(entry as IccMeasurementTagDataEntry); count += this.WriteMeasurementTagDataEntry((IccMeasurementTagDataEntry)entry);
break; break;
case IccTypeSignature.MultiLocalizedUnicode: case IccTypeSignature.MultiLocalizedUnicode:
count += this.WriteMultiLocalizedUnicodeTagDataEntry(entry as IccMultiLocalizedUnicodeTagDataEntry); count += this.WriteMultiLocalizedUnicodeTagDataEntry((IccMultiLocalizedUnicodeTagDataEntry)entry);
break; break;
case IccTypeSignature.MultiProcessElements: case IccTypeSignature.MultiProcessElements:
count += this.WriteMultiProcessElementsTagDataEntry(entry as IccMultiProcessElementsTagDataEntry); count += this.WriteMultiProcessElementsTagDataEntry((IccMultiProcessElementsTagDataEntry)entry);
break; break;
case IccTypeSignature.NamedColor2: case IccTypeSignature.NamedColor2:
count += this.WriteNamedColor2TagDataEntry(entry as IccNamedColor2TagDataEntry); count += this.WriteNamedColor2TagDataEntry((IccNamedColor2TagDataEntry)entry);
break; break;
case IccTypeSignature.ParametricCurve: case IccTypeSignature.ParametricCurve:
count += this.WriteParametricCurveTagDataEntry(entry as IccParametricCurveTagDataEntry); count += this.WriteParametricCurveTagDataEntry((IccParametricCurveTagDataEntry)entry);
break; break;
case IccTypeSignature.ProfileSequenceDesc: case IccTypeSignature.ProfileSequenceDesc:
count += this.WriteProfileSequenceDescTagDataEntry(entry as IccProfileSequenceDescTagDataEntry); count += this.WriteProfileSequenceDescTagDataEntry((IccProfileSequenceDescTagDataEntry)entry);
break; break;
case IccTypeSignature.ProfileSequenceIdentifier: case IccTypeSignature.ProfileSequenceIdentifier:
count += this.WriteProfileSequenceIdentifierTagDataEntry(entry as IccProfileSequenceIdentifierTagDataEntry); count += this.WriteProfileSequenceIdentifierTagDataEntry((IccProfileSequenceIdentifierTagDataEntry)entry);
break; break;
case IccTypeSignature.ResponseCurveSet16: case IccTypeSignature.ResponseCurveSet16:
count += this.WriteResponseCurveSet16TagDataEntry(entry as IccResponseCurveSet16TagDataEntry); count += this.WriteResponseCurveSet16TagDataEntry((IccResponseCurveSet16TagDataEntry)entry);
break; break;
case IccTypeSignature.S15Fixed16Array: case IccTypeSignature.S15Fixed16Array:
count += this.WriteFix16ArrayTagDataEntry(entry as IccFix16ArrayTagDataEntry); count += this.WriteFix16ArrayTagDataEntry((IccFix16ArrayTagDataEntry)entry);
break; break;
case IccTypeSignature.Signature: case IccTypeSignature.Signature:
count += this.WriteSignatureTagDataEntry(entry as IccSignatureTagDataEntry); count += this.WriteSignatureTagDataEntry((IccSignatureTagDataEntry)entry);
break; break;
case IccTypeSignature.Text: case IccTypeSignature.Text:
count += this.WriteTextTagDataEntry(entry as IccTextTagDataEntry); count += this.WriteTextTagDataEntry((IccTextTagDataEntry)entry);
break; break;
case IccTypeSignature.U16Fixed16Array: case IccTypeSignature.U16Fixed16Array:
count += this.WriteUFix16ArrayTagDataEntry(entry as IccUFix16ArrayTagDataEntry); count += this.WriteUFix16ArrayTagDataEntry((IccUFix16ArrayTagDataEntry)entry);
break; break;
case IccTypeSignature.UInt16Array: case IccTypeSignature.UInt16Array:
count += this.WriteUInt16ArrayTagDataEntry(entry as IccUInt16ArrayTagDataEntry); count += this.WriteUInt16ArrayTagDataEntry((IccUInt16ArrayTagDataEntry)entry);
break; break;
case IccTypeSignature.UInt32Array: case IccTypeSignature.UInt32Array:
count += this.WriteUInt32ArrayTagDataEntry(entry as IccUInt32ArrayTagDataEntry); count += this.WriteUInt32ArrayTagDataEntry((IccUInt32ArrayTagDataEntry)entry);
break; break;
case IccTypeSignature.UInt64Array: case IccTypeSignature.UInt64Array:
count += this.WriteUInt64ArrayTagDataEntry(entry as IccUInt64ArrayTagDataEntry); count += this.WriteUInt64ArrayTagDataEntry((IccUInt64ArrayTagDataEntry)entry);
break; break;
case IccTypeSignature.UInt8Array: case IccTypeSignature.UInt8Array:
count += this.WriteUInt8ArrayTagDataEntry(entry as IccUInt8ArrayTagDataEntry); count += this.WriteUInt8ArrayTagDataEntry((IccUInt8ArrayTagDataEntry)entry);
break; break;
case IccTypeSignature.ViewingConditions: case IccTypeSignature.ViewingConditions:
count += this.WriteViewingConditionsTagDataEntry(entry as IccViewingConditionsTagDataEntry); count += this.WriteViewingConditionsTagDataEntry((IccViewingConditionsTagDataEntry)entry);
break; break;
case IccTypeSignature.Xyz: case IccTypeSignature.Xyz:
count += this.WriteXyzTagDataEntry(entry as IccXyzTagDataEntry); count += this.WriteXyzTagDataEntry((IccXyzTagDataEntry)entry);
break; break;
// V2 Types: // V2 Types:
case IccTypeSignature.TextDescription: case IccTypeSignature.TextDescription:
count += this.WriteTextDescriptionTagDataEntry(entry as IccTextDescriptionTagDataEntry); count += this.WriteTextDescriptionTagDataEntry((IccTextDescriptionTagDataEntry)entry);
break; break;
case IccTypeSignature.CrdInfo: case IccTypeSignature.CrdInfo:
count += this.WriteCrdInfoTagDataEntry(entry as IccCrdInfoTagDataEntry); count += this.WriteCrdInfoTagDataEntry((IccCrdInfoTagDataEntry)entry);
break; break;
case IccTypeSignature.Screening: case IccTypeSignature.Screening:
count += this.WriteScreeningTagDataEntry(entry as IccScreeningTagDataEntry); count += this.WriteScreeningTagDataEntry((IccScreeningTagDataEntry)entry);
break; break;
case IccTypeSignature.UcrBg: case IccTypeSignature.UcrBg:
count += this.WriteUcrBgTagDataEntry(entry as IccUcrBgTagDataEntry); count += this.WriteUcrBgTagDataEntry((IccUcrBgTagDataEntry)entry);
break; break;
// Unsupported or unknown // Unsupported or unknown

Loading…
Cancel
Save