1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
|
From 55e03da869a70f9bf07a34d9adb8270e0693f914 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Roucari=C3=A8s?= <rouca@debian.org>
Date: Sun, 26 Jul 2020 22:26:36 +0200
Subject: Fix a few html error
Forwarded: yes
---
www/binary-releases.html | 1 -
www/changelog.html | 12 ++---
www/defines.html | 96 ++++++++++++++++++++++++++++++++++++++--
www/index.html | 10 +++++
www/search.html | 1 +
www/security-policy.html | 1 +
6 files changed, 112 insertions(+), 9 deletions(-)
diff --git a/www/binary-releases.html b/www/binary-releases.html
index b6e959a7ea..49a8f2aac9 100644
--- a/www/binary-releases.html
+++ b/www/binary-releases.html
@@ -65,7 +65,6 @@
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search" />
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
- </div>
</nav>
<div class="container">
<script async="async" src="https://localhost/pagead/js/adsbygoogle.js"></script> <ins class="adsbygoogle"
diff --git a/www/changelog.html b/www/changelog.html
index fe5bca9fec..5887ee8d3a 100644
--- a/www/changelog.html
+++ b/www/changelog.html
@@ -418,13 +418,14 @@
<dt>2020-01-07 6.9.10-85 Cristy <quetzlzacatenango@image...></dt>
<li> Support Fx do() iterator.</li>
<li> `magick -size 100x100 xc:black black.pnm` no longer creates a white image (reference https://github.com/ImageMagick/ImageMagick/issues/1817).</li>
- <li> setjmp/longjmp in jpeg.c no longer trigger undefind behavior (reference<dt> https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=37379).</dt>
- <li> Permit compositing in the CMYK colorspace (reference https://imagemagick.org/discourse-server//viewtopic.html?f=3&t=37368).</li>
+ <li> setjmp/longjmp in jpeg.c no longer trigger undefind behavior (reference https://imagemagick.org/discourse-server/viewtopic.html?f=3&t=37379).</li>
+ <li> Permit compositing in the CMYK colorspace (reference https://imagemagick.org/discourse-server/viewtopic.html?f=3&t=37368).</li>
<dt>2020-01-04 6.9.10-84 Cristy <quetzlzacatenango@image...></dt>
<li> Release ImageMagick version 6.9.10-84, GIT revision 15212:a45335c:20200104.</li>
<dt>2020-01-01 6.9.10-84 Cristy <quetzlzacatenango@image...></dt>
<li> Support extended Fx assignment operators (e.g. *=, /=, ++, --, etc.)</li>
- <li> Support Fx for() iterator.<dt> * Optimize Fx performance.</dt>
+ <li> Support Fx for() iterator. </li>
+ <li> * Optimize Fx performance.</li>
<li> * Ensure circle.rb renders the same for IMv6 and IMv7 (reference https://github.com/rmagick/rmagick/issues/905).</li>
<dt>2019-12-30 6.9.10-83 Cristy <quetzlzacatenango@image...></dt>
<li> Release ImageMagick version 6.9.10-83, GIT revision 15184:9f64323:20191230.</li>
@@ -492,7 +493,8 @@
<dt>2019-10-27 6.9.10-70 Cristy <quetzlzacatenango@image...></dt>
<li> Release ImageMagick version 6.9.10-70, GIT revision 14970:4200095:20191027.</li>
<dt>2019-10-27 6.9.10-70 Cristy <quetzlzacatenango@image...></dt>
- <li> Fixed numerous issues posted to GitHub (reference https://github.com/ImageMagick/ImageMagick/issues).<dt>2019-10-27 6.9.10-70 Cristy <quetzlzacatenango@image...></dt>
+<li> Fixed numerous issues posted to GitHub (reference https://github.com/ImageMagick/ImageMagick/issues).</li>
+<dt>2019-10-27 6.9.10-70 Cristy <quetzlzacatenango@image...></dt>
<li> Release ImageMagick version 6.9.10-70, GIT revision 14970:4200095:20191027.</li>
<dt>2019-10-27 6.9.10-70 Cristy <quetzlzacatenango@image...></dt>
<li> Fixed numerous issues posted to GitHub (reference https://github.com/ImageMagick/ImageMagick/issues).</li>
@@ -794,7 +796,7 @@
<li> Release ImageMagick version 6.9.10-1, GIT revision 13595:dafb03062:20180616.</li>
<dt>2018-06-16 6.9.10-1 Cristy <quetzlzacatenango@image...></dt>
<li> Fixed numerous use of uninitialized values, integer overflow, memory exceeded, and timeouts (credit to OSS Fuzz).</li>
- <li> Fixed an issue with stroke and label: (reference</li>
+ <li> Fixed an issue with stroke and label</li>
<dt>2018-06-12 6.9.10-0 Cristy <quetzlzacatenango@image...></dt>
<li> Release ImageMagick version 6.9.10-0, GIT revision 13585:82d7dbe0b:20180612.</li>
<dt>2018-06-11 6.9.10-0 Cristy <quetzlzacatenango@image...></dt>
diff --git a/www/defines.html b/www/defines.html
index bfd619f4b4..405196a69a 100644
--- a/www/defines.html
+++ b/www/defines.html
@@ -67,8 +67,8 @@
</li>
</ul>
</div>
- <form class="form-inline my-2 my-md-0" action="https://imagemagick.org/script/search.php">
- <input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search">
+ <form class="form-inline my-2 my-lg-0" action="https://legacy.imagemagick.org/https://www.imagemagick.org/script/https://www.imagemagick.org/script/search.php">
+ <input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search" />
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
</form>
</nav>
@@ -1438,7 +1438,96 @@ use:</p>
</table>
-</div>
+<p>Select <var>dataset</var> and <var>record</var> from the following:</p>
+
+<pre class="pre-scrollable:">
+<code>
+ Envelope Record
+ 1:00 Model Version
+ 1:05 Destination
+ 1:20 File Format
+ 1:22 File Format Version
+ 1:30 Service Identifier
+ 1:40 Envelope Number
+ 1:50 Product ID
+ 1:60 Envelope Priority
+ 1:70 Date Sent
+ 1:80 Time Sent
+ 1:90 Coded Character Set
+ 1:100 UNO (Unique Name of Object)
+ 1:120 ARM Identifier
+ 1:122 ARM Version
+
+Application Record
+ 2:00 Record Version
+ 2:03 Object Type Reference
+ 2:05 Object Name (Title)
+ 2:07 Edit Status
+ 2:08 Editorial Update
+ 2:10 Urgency
+ 2:12 Subject Reference
+ 2:15 Category
+ 2:20 Supplemental Category
+ 2:22 Fixture Identifier
+ 2:25 Keywords
+ 2:26 Content Location Code
+ 2:27 Content Location Name
+ 2:30 Release Date
+ 2:35 Release Time
+ 2:37 Expiration Date
+ 2:38 Expiration Time
+ 2:40 Special Instructions
+ 2:42 Action Advised
+ 2:45 Reference Service
+ 2:47 Reference Date
+ 2:50 Reference Number
+ 2:55 Date Created
+ 2:60 Time Created
+ 2:62 Digital Creation Date
+ 2:63 Digital Creation Time
+ 2:65 Originating Program
+ 2:70 Program Version
+ 2:75 Object Cycle
+ 2:80 By-Line (Author)
+ 2:85 By-Line Title (Author Position) [Not used in Photoshop 7]
+ 2:90 City
+ 2:92 Sub-Location
+ 2:95 Province/State
+ 2:100 Country/Primary Location Code
+ 2:101 Country/Primary Location Name
+ 2:103 Original Transmission Reference
+ 2:105 Headline
+ 2:110 Credit
+ 2:115 Source
+ 2:116 Copyright Notice
+ 2:118 Contact
+ 2:120 Caption/Abstract
+ 2:122 Caption Writer/Editor
+ 2:125 Rasterized Caption
+ 2:130 Image Type
+ 2:131 Image Orientation
+ 2:135 Language Identifier
+ 2:150 Audio Type
+ 2:151 Audio Sampling Rate
+ 2:152 Audio Sampling Resolution
+ 2:153 Audio Duration
+ 2:154 Audio Outcue
+ 2:200 ObjectData Preview File Format
+ 2:201 ObjectData Preview File Format Version
+ 2:202 ObjectData Preview Data
+
+Pre-ObjectData Descriptor Record
+ 7:10 Size Mode
+ 7:20 Max Subfile Size
+ 7:90 ObjectData Size Announced
+ 7:95 Maximum ObjectData Size
+
+ObjectData Record
+ 8:10 Subfile
+
+Post ObjectData Descriptor Record
+ 9:10 Confirmed ObjectData Size
+</code></pre>
</div>
</div>
</main><!-- /.container -->
@@ -1468,3 +1557,4 @@ use:</p>
<script>window.jQuery || document.write('<script src="assets/jquery.slim.min.js"><\/script>')</script><script src="assets/bootstrap.bundle.min.js" integrity="sha384-LtrjvnR4Twt/qOuYxE721u19sVFLVSA4hf/rRt6PrZTmiPltdZcI7q7PXQBYTKyf" crossorigin="anonymous">
</body>
</html>
+<!-- Magick Cache 1st January 2021 19:38 -->
diff --git a/www/index.html b/www/index.html
index 51355732f9..abff1f327b 100644
--- a/www/index.html
+++ b/www/index.html
@@ -237,7 +237,17 @@ Use ImageMagick<sup><a href="http://tarr.uspto.gov/servlet/tarr?regser=serial&am
</table>
</div>
+<<<<<<< HEAD
<p><a href="https://legacy.imagemagick.org/Usage/" target="_blank">Examples of ImageMagick Usage</a> shows how to use ImageMagick from the <a href="command-line-processing.html">command-line</a> to accomplish any of these tasks and much more. Also, see <a href="http://www.fmwconcepts.com/imagemagick/" target="_blank">Fred's ImageMagick Scripts</a>: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations. With <a href="https://github.com/dlemstra/Magick.NET">Magick.NET</a>, use ImageMagick without having to install ImageMagick on your server or desktop. Finally, see <a href="http://im.snibgo.com/">Snibgo's ImageMagick Cookbook</a> for Windows-based ImageMagick scripting.</p>
+=======
+<p><a href="https://imagemagick.org/Usage/" target="_blank">Examples of ImageMagick Usage</a> shows how to use ImageMagick from the <a href="command-line-processing.html">command-line</a> to accomplish any of these tasks and much more. Also, see <a href="http://www.fmwconcepts.com/imagemagick/" target="_blank">Fred's ImageMagick Scripts</a>: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations. With <a href="https://github.com/dlemstra/Magick.NET">Magick.NET</a>, use ImageMagick without having to install ImageMagick on your server or desktop.</p>
+
+<h2><a class="anchor" id="news"></a>News</h2>
+
+<p>ImageMagick <a href="https://imagemagick.org">version 7</a> has been released. We encourage you to migrate your workstreams to version 7. However, we recognize a significant version 6 user community. As such, the ImageMagick development team is committed to maintain, but not enhance, version 6 at least until 2028 and possibly beyond.</p>
+
+<p>We discovered a bug in the pseudo-random generator prior to ImageMagick 6.9.10-81, the first 3 values repeated because the random state was not initialized properly. As a consequence of the fix, expect a different numerical sequence when seeding (-seed).</p>
+>>>>>>> f37c4e635d (Fix a few html error)
</div>
</div>
diff --git a/www/search.html b/www/search.html
index fd224dd29d..985d9c1dcf 100644
--- a/www/search.html
+++ b/www/search.html
@@ -66,6 +66,7 @@
<iframe src="https://github.com/sponsors/ImageMagick/button" title="Sponsor ImageMagick" height="35" width="107" style="border: 0;"></iframe>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://legacy.imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search" />
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
diff --git a/www/security-policy.html b/www/security-policy.html
index 9ccc4b496a..593d71af45 100644
--- a/www/security-policy.html
+++ b/www/security-policy.html
@@ -66,6 +66,7 @@
<iframe src="https://github.com/sponsors/ImageMagick/button" title="Sponsor ImageMagick" height="35" width="107" style="border: 0;"></iframe>
</li>
</ul>
+ </div>
<form class="form-inline my-2 my-lg-0" action="https://legacy.imagemagick.org/script/search.php">
<input class="form-control mr-sm-2" type="text" name="q" placeholder="Search" aria-label="Search" />
<button class="btn btn-outline-success my-2 my-sm-0" type="submit" name="sa">Search</button>
|
