Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix random string at the top of tiffload operations #91

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Fix random string at the top of tiffload operations #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions core/src/main/java/app/photofox/vipsffm/VImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4391,8 +4391,6 @@ public VImage jpegload(String filename, VipsOption... args) throws VipsError {
}

/**
* <p>during load</p>
*
* <p>Read a JPEG-formatted memory block into a VIPS image. Exactly as
* {@link #jpegload}, but read from a memory buffer.</p>
*
Expand Down Expand Up @@ -4425,8 +4423,6 @@ public VImage jpegloadBuffer(VBlob buffer, VipsOption... args) throws VipsError
}

/**
* <p>during load</p>
*
* <p>Read a JPEG-formatted memory block into a VIPS image. Exactly as
* {@link #jpegload}, but read from a source.</p>
*
Expand Down Expand Up @@ -9115,8 +9111,6 @@ public VImage thumbnailSource(VSource source, int width, VipsOption... args) thr
}

/**
* <p>during load</p>
*
* <p>Read a TIFF file into a VIPS image. It is a full baseline TIFF 6 reader,
* with extensions for tiled images, multipage images, XYZ and LAB colour
* space, pyramidal images and JPEG compression, including CMYK and YCbCr.</p>
Expand Down Expand Up @@ -9182,8 +9176,6 @@ public VImage tiffload(String filename, VipsOption... args) throws VipsError {
}

/**
* <p>during load</p>
*
* <p>Read a TIFF-formatted memory block into a VIPS image. Exactly as
* {@link #tiffload}, but read from a memory source.</p>
*
Expand Down Expand Up @@ -9217,8 +9209,6 @@ public VImage tiffloadBuffer(VBlob buffer, VipsOption... args) throws VipsError
}

/**
* <p>during load</p>
*
* <p>Exactly as {@link #tiffload}, but read from a source.</p>
*
* <p>See also: {@link #tiffload}.</p>
Expand Down
30 changes: 10 additions & 20 deletions docs/app.photofox.vipsffm/app/photofox/vipsffm/VImage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1243,13 +1243,13 @@ <h2>Method Summary</h2>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#jpegloadBuffer(app.photofox.vipsffm.VBlob,app.photofox.vipsffm.VipsOption...)" class="member-name-link">jpegloadBuffer</a><wbr>(<a href="VBlob.html" title="class in app.photofox.vipsffm">VBlob</a>&nbsp;buffer,
<a href="VipsOption.html" title="interface in app.photofox.vipsffm">VipsOption</a>...&nbsp;args)</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">during load</div>
<div class="block">Read a JPEG-formatted memory block into a VIPS image.</div>
</div>
<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="VImage.html" title="class in app.photofox.vipsffm">VImage</a></code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#jpegloadSource(app.photofox.vipsffm.VSource,app.photofox.vipsffm.VipsOption...)" class="member-name-link">jpegloadSource</a><wbr>(<a href="VSource.html" title="class in app.photofox.vipsffm">VSource</a>&nbsp;source,
<a href="VipsOption.html" title="interface in app.photofox.vipsffm">VipsOption</a>...&nbsp;args)</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">during load</div>
<div class="block">Read a JPEG-formatted memory block into a VIPS image.</div>
</div>
<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#jpegsave(java.lang.String,app.photofox.vipsffm.VipsOption...)" class="member-name-link">jpegsave</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;filename,
Expand Down Expand Up @@ -2215,19 +2215,19 @@ <h2>Method Summary</h2>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#tiffload(java.lang.String,app.photofox.vipsffm.VipsOption...)" class="member-name-link">tiffload</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;filename,
<a href="VipsOption.html" title="interface in app.photofox.vipsffm">VipsOption</a>...&nbsp;args)</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">during load</div>
<div class="block">Read a TIFF file into a VIPS image.</div>
</div>
<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="VImage.html" title="class in app.photofox.vipsffm">VImage</a></code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#tiffloadBuffer(app.photofox.vipsffm.VBlob,app.photofox.vipsffm.VipsOption...)" class="member-name-link">tiffloadBuffer</a><wbr>(<a href="VBlob.html" title="class in app.photofox.vipsffm">VBlob</a>&nbsp;buffer,
<a href="VipsOption.html" title="interface in app.photofox.vipsffm">VipsOption</a>...&nbsp;args)</code></div>
<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">during load</div>
<div class="block">Read a TIFF-formatted memory block into a VIPS image.</div>
</div>
<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="VImage.html" title="class in app.photofox.vipsffm">VImage</a></code></div>
<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#tiffloadSource(app.photofox.vipsffm.VSource,app.photofox.vipsffm.VipsOption...)" class="member-name-link">tiffloadSource</a><wbr>(<a href="VSource.html" title="class in app.photofox.vipsffm">VSource</a>&nbsp;source,
<a href="VipsOption.html" title="interface in app.photofox.vipsffm">VipsOption</a>...&nbsp;args)</code></div>
<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
<div class="block">during load</div>
<div class="block">Exactly as <a href="#tiffload(java.lang.String,app.photofox.vipsffm.VipsOption...)"><code>tiffload(java.lang.String, app.photofox.vipsffm.VipsOption...)</code></a>, but read from a source.</div>
</div>
<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#tiffsave(java.lang.String,app.photofox.vipsffm.VipsOption...)" class="member-name-link">tiffsave</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;filename,
Expand Down Expand Up @@ -6686,9 +6686,7 @@ <h3>jpegloadBuffer</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="VImage.html" title="class in app.photofox.vipsffm">VImage</a></span>&nbsp;<span class="element-name">jpegloadBuffer</span><wbr><span class="parameters">(<a href="VBlob.html" title="class in app.photofox.vipsffm">VBlob</a>&nbsp;buffer,
<a href="VipsOption.html" title="interface in app.photofox.vipsffm">VipsOption</a>...&nbsp;args)</span>
throws <span class="exceptions"><a href="VipsError.html" title="class in app.photofox.vipsffm">VipsError</a></span></div>
<div class="block"><p>during load</p>

<p>Read a JPEG-formatted memory block into a VIPS image. Exactly as
<div class="block"><p>Read a JPEG-formatted memory block into a VIPS image. Exactly as
<a href="#jpegload(java.lang.String,app.photofox.vipsffm.VipsOption...)"><code>jpegload(java.lang.String, app.photofox.vipsffm.VipsOption...)</code></a>, but read from a memory buffer.</p>

<p>You must not free the buffer while is active. The
Expand All @@ -6714,9 +6712,7 @@ <h3>jpegloadSource</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="VImage.html" title="class in app.photofox.vipsffm">VImage</a></span>&nbsp;<span class="element-name">jpegloadSource</span><wbr><span class="parameters">(<a href="VSource.html" title="class in app.photofox.vipsffm">VSource</a>&nbsp;source,
<a href="VipsOption.html" title="interface in app.photofox.vipsffm">VipsOption</a>...&nbsp;args)</span>
throws <span class="exceptions"><a href="VipsError.html" title="class in app.photofox.vipsffm">VipsError</a></span></div>
<div class="block"><p>during load</p>

<p>Read a JPEG-formatted memory block into a VIPS image. Exactly as
<div class="block"><p>Read a JPEG-formatted memory block into a VIPS image. Exactly as
<a href="#jpegload(java.lang.String,app.photofox.vipsffm.VipsOption...)"><code>jpegload(java.lang.String, app.photofox.vipsffm.VipsOption...)</code></a>, but read from a source.</p>

<p>See also: <a href="#jpegload(java.lang.String,app.photofox.vipsffm.VipsOption...)"><code>jpegload(java.lang.String, app.photofox.vipsffm.VipsOption...)</code></a>.</p></div>
Expand Down Expand Up @@ -11086,9 +11082,7 @@ <h3>tiffload</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="VImage.html" title="class in app.photofox.vipsffm">VImage</a></span>&nbsp;<span class="element-name">tiffload</span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/23/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;filename,
<a href="VipsOption.html" title="interface in app.photofox.vipsffm">VipsOption</a>...&nbsp;args)</span>
throws <span class="exceptions"><a href="VipsError.html" title="class in app.photofox.vipsffm">VipsError</a></span></div>
<div class="block"><p>during load</p>

<p>Read a TIFF file into a VIPS image. It is a full baseline TIFF 6 reader,
<div class="block"><p>Read a TIFF file into a VIPS image. It is a full baseline TIFF 6 reader,
with extensions for tiled images, multipage images, XYZ and LAB colour
space, pyramidal images and JPEG compression, including CMYK and YCbCr.</p>

Expand Down Expand Up @@ -11146,9 +11140,7 @@ <h3>tiffloadBuffer</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="VImage.html" title="class in app.photofox.vipsffm">VImage</a></span>&nbsp;<span class="element-name">tiffloadBuffer</span><wbr><span class="parameters">(<a href="VBlob.html" title="class in app.photofox.vipsffm">VBlob</a>&nbsp;buffer,
<a href="VipsOption.html" title="interface in app.photofox.vipsffm">VipsOption</a>...&nbsp;args)</span>
throws <span class="exceptions"><a href="VipsError.html" title="class in app.photofox.vipsffm">VipsError</a></span></div>
<div class="block"><p>during load</p>

<p>Read a TIFF-formatted memory block into a VIPS image. Exactly as
<div class="block"><p>Read a TIFF-formatted memory block into a VIPS image. Exactly as
<a href="#tiffload(java.lang.String,app.photofox.vipsffm.VipsOption...)"><code>tiffload(java.lang.String, app.photofox.vipsffm.VipsOption...)</code></a>, but read from a memory source.</p>

<p>You must not free the buffer while is active. The
Expand All @@ -11174,9 +11166,7 @@ <h3>tiffloadSource</h3>
<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="VImage.html" title="class in app.photofox.vipsffm">VImage</a></span>&nbsp;<span class="element-name">tiffloadSource</span><wbr><span class="parameters">(<a href="VSource.html" title="class in app.photofox.vipsffm">VSource</a>&nbsp;source,
<a href="VipsOption.html" title="interface in app.photofox.vipsffm">VipsOption</a>...&nbsp;args)</span>
throws <span class="exceptions"><a href="VipsError.html" title="class in app.photofox.vipsffm">VipsError</a></span></div>
<div class="block"><p>during load</p>

<p>Exactly as <a href="#tiffload(java.lang.String,app.photofox.vipsffm.VipsOption...)"><code>tiffload(java.lang.String, app.photofox.vipsffm.VipsOption...)</code></a>, but read from a source.</p>
<div class="block"><p>Exactly as <a href="#tiffload(java.lang.String,app.photofox.vipsffm.VipsOption...)"><code>tiffload(java.lang.String, app.photofox.vipsffm.VipsOption...)</code></a>, but read from a source.</p>

<p>See also: <a href="#tiffload(java.lang.String,app.photofox.vipsffm.VipsOption...)"><code>tiffload(java.lang.String, app.photofox.vipsffm.VipsOption...)</code></a>.</p></div>
<dl class="notes">
Expand Down
10 changes: 5 additions & 5 deletions docs/index-all.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12976,11 +12976,11 @@ <h2 class="title" id="I:J">J</h2>
</dd>
<dt><a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html#jpegloadBuffer(app.photofox.vipsffm.VBlob,app.photofox.vipsffm.VipsOption...)" class="member-name-link">jpegloadBuffer(VBlob, VipsOption...)</a> - Method in class app.photofox.vipsffm.<a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html" title="class in app.photofox.vipsffm">VImage</a></dt>
<dd>
<div class="block">during load</div>
<div class="block">Read a JPEG-formatted memory block into a VIPS image.</div>
</dd>
<dt><a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html#jpegloadSource(app.photofox.vipsffm.VSource,app.photofox.vipsffm.VipsOption...)" class="member-name-link">jpegloadSource(VSource, VipsOption...)</a> - Method in class app.photofox.vipsffm.<a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html" title="class in app.photofox.vipsffm">VImage</a></dt>
<dd>
<div class="block">during load</div>
<div class="block">Read a JPEG-formatted memory block into a VIPS image.</div>
</dd>
<dt><a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html#jpegsave(java.lang.String,app.photofox.vipsffm.VipsOption...)" class="member-name-link">jpegsave(String, VipsOption...)</a> - Method in class app.photofox.vipsffm.<a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html" title="class in app.photofox.vipsffm">VImage</a></dt>
<dd>
Expand Down Expand Up @@ -19677,15 +19677,15 @@ <h2 class="title" id="I:T">T</h2>
</dd>
<dt><a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html#tiffload(java.lang.String,app.photofox.vipsffm.VipsOption...)" class="member-name-link">tiffload(String, VipsOption...)</a> - Method in class app.photofox.vipsffm.<a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html" title="class in app.photofox.vipsffm">VImage</a></dt>
<dd>
<div class="block">during load</div>
<div class="block">Read a TIFF file into a VIPS image.</div>
</dd>
<dt><a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html#tiffloadBuffer(app.photofox.vipsffm.VBlob,app.photofox.vipsffm.VipsOption...)" class="member-name-link">tiffloadBuffer(VBlob, VipsOption...)</a> - Method in class app.photofox.vipsffm.<a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html" title="class in app.photofox.vipsffm">VImage</a></dt>
<dd>
<div class="block">during load</div>
<div class="block">Read a TIFF-formatted memory block into a VIPS image.</div>
</dd>
<dt><a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html#tiffloadSource(app.photofox.vipsffm.VSource,app.photofox.vipsffm.VipsOption...)" class="member-name-link">tiffloadSource(VSource, VipsOption...)</a> - Method in class app.photofox.vipsffm.<a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html" title="class in app.photofox.vipsffm">VImage</a></dt>
<dd>
<div class="block">during load</div>
<div class="block">Exactly as <a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html#tiffload(java.lang.String,app.photofox.vipsffm.VipsOption...)"><code>VImage.tiffload(java.lang.String, app.photofox.vipsffm.VipsOption...)</code></a>, but read from a source.</div>
</dd>
<dt><a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html#tiffsave(java.lang.String,app.photofox.vipsffm.VipsOption...)" class="member-name-link">tiffsave(String, VipsOption...)</a> - Method in class app.photofox.vipsffm.<a href="app.photofox.vipsffm/app/photofox/vipsffm/VImage.html" title="class in app.photofox.vipsffm">VImage</a></dt>
<dd>
Expand Down
5 changes: 2 additions & 3 deletions generator/src/main/kotlin/vipsffm/GenerateVClasses.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ object GenerateVClasses {

val referencedClassNames = mutableListOf<ClassName>()

girDoc = girDoc.replace("\\* @[A-Za-z0-9-_]*:(.)*\n([ ]+([A-Za-z0-9-_]*\n))?".toRegex(), "")
girDoc = girDoc.replace("Optional arguments:\n\n?(\\*?(.+)\n)+".toRegex(), "")

girDoc = girDoc.replace("@([A-Za-z0-9-_]*)".toRegex()) { match ->
val referencedName = match.groups[1]!!.value
Expand Down Expand Up @@ -358,8 +358,7 @@ object GenerateVClasses {
}
}

girDoc = "<p>" + girDoc.replace("Optional arguments:\n\n".toRegex(), "")
.replace("\n\n", "</p>\n\n<p>")
girDoc = "<p>" + girDoc.replace("\n\n", "</p>\n\n<p>")
.trim() + "</p>"

girDoc = girDoc.replace("<(link|function)".toRegex(), "<code")
Expand Down