Skip to content

Commit feb1aa6

Browse files
author
Dirk Lemstra
committed
Updated MagickScript.
1 parent 3f3cc76 commit feb1aa6

File tree

4 files changed

+35
-1
lines changed

4 files changed

+35
-1
lines changed

Source/Magick.NET/Resources/ReleaseQ16-HDRI/MagickScript.xsd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1324,6 +1324,9 @@
13241324
<xs:complexType name="bmpWriteDefines">
13251325
<xs:attribute name="subtype" type="BmpSubtype" />
13261326
</xs:complexType>
1327+
<xs:complexType name="ddsReadDefines">
1328+
<xs:attribute name="skipMipmaps" type="bool" />
1329+
</xs:complexType>
13271330
<xs:complexType name="ddsWriteDefines">
13281331
<xs:attribute name="clusterFit" type="bool" />
13291332
<xs:attribute name="compression" type="DdsCompression" />
@@ -3125,6 +3128,7 @@
31253128
<xs:sequence>
31263129
<xs:choice>
31273130
<xs:element name="bmpWriteDefines" type="bmpWriteDefines" />
3131+
<xs:element name="ddsReadDefines" type="ddsReadDefines" />
31283132
<xs:element name="ddsWriteDefines" type="ddsWriteDefines" />
31293133
<xs:element name="jp2ReadDefines" type="jp2ReadDefines" />
31303134
<xs:element name="jp2WriteDefines" type="jp2WriteDefines" />
@@ -3609,6 +3613,7 @@
36093613
<xs:group name="iReadDefines">
36103614
<xs:sequence>
36113615
<xs:choice>
3616+
<xs:element name="ddsReadDefines" type="ddsReadDefines" />
36123617
<xs:element name="jp2ReadDefines" type="jp2ReadDefines" />
36133618
<xs:element name="jpegReadDefines" type="jpegReadDefines" />
36143619
<xs:element name="pdfReadDefines" type="pdfReadDefines" />

Source/Magick.NET/Resources/ReleaseQ16/MagickScript.xsd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1314,6 +1314,9 @@
13141314
<xs:complexType name="bmpWriteDefines">
13151315
<xs:attribute name="subtype" type="BmpSubtype" />
13161316
</xs:complexType>
1317+
<xs:complexType name="ddsReadDefines">
1318+
<xs:attribute name="skipMipmaps" type="bool" />
1319+
</xs:complexType>
13171320
<xs:complexType name="ddsWriteDefines">
13181321
<xs:attribute name="clusterFit" type="bool" />
13191322
<xs:attribute name="compression" type="DdsCompression" />
@@ -3115,6 +3118,7 @@
31153118
<xs:sequence>
31163119
<xs:choice>
31173120
<xs:element name="bmpWriteDefines" type="bmpWriteDefines" />
3121+
<xs:element name="ddsReadDefines" type="ddsReadDefines" />
31183122
<xs:element name="ddsWriteDefines" type="ddsWriteDefines" />
31193123
<xs:element name="jp2ReadDefines" type="jp2ReadDefines" />
31203124
<xs:element name="jp2WriteDefines" type="jp2WriteDefines" />
@@ -3599,6 +3603,7 @@
35993603
<xs:group name="iReadDefines">
36003604
<xs:sequence>
36013605
<xs:choice>
3606+
<xs:element name="ddsReadDefines" type="ddsReadDefines" />
36023607
<xs:element name="jp2ReadDefines" type="jp2ReadDefines" />
36033608
<xs:element name="jpegReadDefines" type="jpegReadDefines" />
36043609
<xs:element name="pdfReadDefines" type="pdfReadDefines" />

Source/Magick.NET/Resources/ReleaseQ8/MagickScript.xsd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,6 +1313,9 @@
13131313
<xs:complexType name="bmpWriteDefines">
13141314
<xs:attribute name="subtype" type="BmpSubtype" />
13151315
</xs:complexType>
1316+
<xs:complexType name="ddsReadDefines">
1317+
<xs:attribute name="skipMipmaps" type="bool" />
1318+
</xs:complexType>
13161319
<xs:complexType name="ddsWriteDefines">
13171320
<xs:attribute name="clusterFit" type="bool" />
13181321
<xs:attribute name="compression" type="DdsCompression" />
@@ -3114,6 +3117,7 @@
31143117
<xs:sequence>
31153118
<xs:choice>
31163119
<xs:element name="bmpWriteDefines" type="bmpWriteDefines" />
3120+
<xs:element name="ddsReadDefines" type="ddsReadDefines" />
31173121
<xs:element name="ddsWriteDefines" type="ddsWriteDefines" />
31183122
<xs:element name="jp2ReadDefines" type="jp2ReadDefines" />
31193123
<xs:element name="jp2WriteDefines" type="jp2WriteDefines" />
@@ -3598,6 +3602,7 @@
35983602
<xs:group name="iReadDefines">
35993603
<xs:sequence>
36003604
<xs:choice>
3605+
<xs:element name="ddsReadDefines" type="ddsReadDefines" />
36013606
<xs:element name="jp2ReadDefines" type="jp2ReadDefines" />
36023607
<xs:element name="jpegReadDefines" type="jpegReadDefines" />
36033608
<xs:element name="pdfReadDefines" type="pdfReadDefines" />

Source/Magick.NET/Shared/Script/Generated/IDefines.cs

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,18 @@ private IDefines CreateIDefines(XmlElement parent)
5252
}
5353
case 'd':
5454
{
55-
return CreateDdsWriteDefines(element);
55+
switch(element.Name[3])
56+
{
57+
case 'R':
58+
{
59+
return CreateDdsReadDefines(element);
60+
}
61+
case 'W':
62+
{
63+
return CreateDdsWriteDefines(element);
64+
}
65+
}
66+
break;
5667
}
5768
case 'j':
5869
{
@@ -147,6 +158,14 @@ private IDefines CreateBmpWriteDefines(XmlElement element)
147158
result.Subtype = Variables.GetValue<Nullable<ImageMagick.Defines.BmpSubtype>>(element, "subtype");
148159
return result;
149160
}
161+
private IDefines CreateDdsReadDefines(XmlElement element)
162+
{
163+
if (element == null)
164+
return null;
165+
DdsReadDefines result = new DdsReadDefines();
166+
result.SkipMipmaps = Variables.GetValue<Nullable<Boolean>>(element, "skipMipmaps");
167+
return result;
168+
}
150169
private IDefines CreateDdsWriteDefines(XmlElement element)
151170
{
152171
if (element == null)

0 commit comments

Comments
 (0)