Skip to content

Commit 9f88a3e

Browse files
authored
Remove deprecated manual methods, and hide deprecated operations (#155)
1 parent 38cc1c1 commit 9f88a3e

File tree

191 files changed

+785
-1605
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+785
-1605
lines changed

core/src/main/java/app/photofox/vipsffm/VBlob.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ public static VBlob newFromBytes(Arena arena, byte[] bytes) throws VipsError {
4747
return new VBlob(arena, blobAddress);
4848
}
4949

50-
/// @deprecated Replaced by [#getUnsafeStructAddress()]
51-
@Deprecated(since = "0.5.10", forRemoval = true)
52-
public MemorySegment getUnsafeAddress() throws VipsError {
53-
return this.getUnsafeStructAddress();
54-
}
55-
5650
/// Gets the raw [MemorySegment] (C pointer) for this VipsBlob struct
5751
///
5852
/// You might want the data address instead [#getUnsafeDataAddress()]
@@ -91,12 +85,6 @@ public long byteSize() {
9185
return VipsArea.length(this.address);
9286
}
9387

94-
/// @deprecated Replaced by [#asArenaScopedByteBuffer()]
95-
@Deprecated(since = "0.5.10", forRemoval = true)
96-
public ByteBuffer asByteBuffer() {
97-
return this.asArenaScopedByteBuffer();
98-
}
99-
10088
/// ByteBuffer representation of the data in this blob
10189
///
10290
/// Mapped to native memory via DirectByteBuffer, hence does not make a copy, so the data has the

core/src/main/java/app/photofox/vipsffm/VImage.java

Lines changed: 0 additions & 202 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import app.photofox.vipsffm.enums.VipsTextWrap;
4444
import java.io.InputStream;
4545
import java.io.OutputStream;
46-
import java.lang.Deprecated;
4746
import java.lang.Double;
4847
import java.lang.Integer;
4948
import java.lang.Object;
@@ -83,15 +82,6 @@ public boolean equals(Object o) {
8382
return Objects.equals(arena, vImage.arena) && Objects.equals(address, vImage.address);
8483
}
8584

86-
/// @deprecated See [#getUnsafeStructAddress]
87-
@Deprecated(
88-
since = "0.5.10",
89-
forRemoval = true
90-
)
91-
public MemorySegment getUnsafeAddress() {
92-
return this.getUnsafeStructAddress();
93-
}
94-
9585
/// Gets the raw [MemorySegment] (C pointer) for this VipsImage struct
9686
/// The memory address' lifetime is bound to the scope of the [#arena]
9787
/// Usage of the memory address is strongly discouraged, but it is available if some functionality is missing and you need to use it with [VipsHelper]
@@ -633,34 +623,6 @@ public double avg(VipsOption... args) throws VipsError {
633623
return outOption.valueOrThrow();
634624
}
635625

636-
/// Save image in AVIF format
637-
/// @param target Target to save to
638-
/// @param args Array of VipsOption to apply to this operation
639-
/// @optionalArg Q [VipsOption.Int] Q factor
640-
/// @optionalArg bitdepth [VipsOption.Int] Number of bits per pixel
641-
/// @optionalArg lossless [VipsOption.Boolean] Enable lossless compression
642-
/// @optionalArg compression [VipsOption.Enum] [VipsForeignHeifCompression] Compression format
643-
/// @optionalArg effort [VipsOption.Int] CPU effort
644-
/// @optionalArg subsample-mode [VipsOption.Enum] [VipsForeignSubsample] Select chroma subsample operation mode
645-
/// @optionalArg speed [VipsOption.Int] CPU effort
646-
/// @optionalArg encoder [VipsOption.Enum] [VipsForeignHeifEncoder] Select encoder to use
647-
/// @optionalArg keep [VipsOption.Int] Which metadata to retain
648-
/// @optionalArg background [VipsOption.ArrayDouble] Background value
649-
/// @optionalArg page-height [VipsOption.Int] Set page height for multipage save
650-
/// @optionalArg profile [VipsOption.String] Filename of ICC profile to embed
651-
/// @optionalArg strip [VipsOption.Boolean] Strip all metadata from image
652-
@Deprecated(
653-
forRemoval = true
654-
)
655-
public void avifsaveTarget(VTarget target, VipsOption... args) throws VipsError {
656-
var inOption = VipsOption.Image("in", this);
657-
var targetOption = VipsOption.Target("target", target);
658-
var callArgs = new ArrayList<>(Arrays.asList(args));
659-
callArgs.add(inOption);
660-
callArgs.add(targetOption);
661-
VipsInvoker.invokeOperation(arena, "avifsave_target", callArgs);
662-
}
663-
664626
/// Perform various boolean operations across the bands of an image. For
665627
/// example, a three-band uchar image operated on with
666628
/// [VipsOperationBoolean#OPERATION_BOOLEAN_AND] will produce a one-band uchar image where each
@@ -965,24 +927,6 @@ public VImage byteswap(VipsOption... args) throws VipsError {
965927
return outOption.valueOrThrow();
966928
}
967929

968-
/// Cache an image
969-
/// @param args Array of VipsOption to apply to this operation
970-
/// @optionalArg max-tiles [VipsOption.Int] Maximum number of tiles to cache
971-
/// @optionalArg tile-height [VipsOption.Int] Tile height in pixels
972-
/// @optionalArg tile-width [VipsOption.Int] Tile width in pixels
973-
@Deprecated(
974-
forRemoval = true
975-
)
976-
public VImage cache(VipsOption... args) throws VipsError {
977-
var inOption = VipsOption.Image("in", this);
978-
var outOption = VipsOption.Image("out");
979-
var callArgs = new ArrayList<>(Arrays.asList(args));
980-
callArgs.add(inOption);
981-
callArgs.add(outOption);
982-
VipsInvoker.invokeOperation(arena, "cache", callArgs);
983-
return outOption.valueOrThrow();
984-
}
985-
986930
/// Find edges by Canny's method: The maximum of the derivative of the gradient
987931
/// in the direction of the gradient. Output is float, except for uchar input,
988932
/// where output is uchar, and double input, where output is double. Non-complex
@@ -4720,56 +4664,6 @@ public void magicksave(String filename, VipsOption... args) throws VipsError {
47204664
VipsInvoker.invokeOperation(arena, "magicksave", callArgs);
47214665
}
47224666

4723-
/// Save bmp image with ImageMagick
4724-
/// @param filename Filename to save to
4725-
/// @param args Array of VipsOption to apply to this operation
4726-
/// @optionalArg format [VipsOption.String] Format to save in
4727-
/// @optionalArg quality [VipsOption.Int] Quality to use
4728-
/// @optionalArg optimize-gif-frames [VipsOption.Boolean] Apply GIF frames optimization
4729-
/// @optionalArg optimize-gif-transparency [VipsOption.Boolean] Apply GIF transparency optimization
4730-
/// @optionalArg bitdepth [VipsOption.Int] Number of bits per pixel
4731-
/// @optionalArg keep [VipsOption.Int] Which metadata to retain
4732-
/// @optionalArg background [VipsOption.ArrayDouble] Background value
4733-
/// @optionalArg page-height [VipsOption.Int] Set page height for multipage save
4734-
/// @optionalArg profile [VipsOption.String] Filename of ICC profile to embed
4735-
/// @optionalArg strip [VipsOption.Boolean] Strip all metadata from image
4736-
@Deprecated(
4737-
forRemoval = true
4738-
)
4739-
public void magicksaveBmp(String filename, VipsOption... args) throws VipsError {
4740-
var inOption = VipsOption.Image("in", this);
4741-
var filenameOption = VipsOption.String("filename", filename);
4742-
var callArgs = new ArrayList<>(Arrays.asList(args));
4743-
callArgs.add(inOption);
4744-
callArgs.add(filenameOption);
4745-
VipsInvoker.invokeOperation(arena, "magicksave_bmp", callArgs);
4746-
}
4747-
4748-
/// Save bmp image to magick buffer
4749-
/// @param args Array of VipsOption to apply to this operation
4750-
/// @optionalArg format [VipsOption.String] Format to save in
4751-
/// @optionalArg quality [VipsOption.Int] Quality to use
4752-
/// @optionalArg optimize-gif-frames [VipsOption.Boolean] Apply GIF frames optimization
4753-
/// @optionalArg optimize-gif-transparency [VipsOption.Boolean] Apply GIF transparency optimization
4754-
/// @optionalArg bitdepth [VipsOption.Int] Number of bits per pixel
4755-
/// @optionalArg keep [VipsOption.Int] Which metadata to retain
4756-
/// @optionalArg background [VipsOption.ArrayDouble] Background value
4757-
/// @optionalArg page-height [VipsOption.Int] Set page height for multipage save
4758-
/// @optionalArg profile [VipsOption.String] Filename of ICC profile to embed
4759-
/// @optionalArg strip [VipsOption.Boolean] Strip all metadata from image
4760-
@Deprecated(
4761-
forRemoval = true
4762-
)
4763-
public VBlob magicksaveBmpBuffer(VipsOption... args) throws VipsError {
4764-
var inOption = VipsOption.Image("in", this);
4765-
var bufferOption = VipsOption.Blob("buffer");
4766-
var callArgs = new ArrayList<>(Arrays.asList(args));
4767-
callArgs.add(inOption);
4768-
callArgs.add(bufferOption);
4769-
VipsInvoker.invokeOperation(arena, "magicksave_bmp_buffer", callArgs);
4770-
return bufferOption.valueOrThrow();
4771-
}
4772-
47734667
/// As [VImage#magicksave], but save to a memory buffer.
47744668
///
47754669
/// The address of the buffer is returned in `obuf`, the length of the buffer in
@@ -6162,30 +6056,6 @@ public static VImage openslideloadSource(Arena arena, VSource source, VipsOption
61626056
return outOption.valueOrThrow();
61636057
}
61646058

6165-
/// Save image in pbm format
6166-
/// @param target Target to save to
6167-
/// @param args Array of VipsOption to apply to this operation
6168-
/// @optionalArg format [VipsOption.Enum] [VipsForeignPpmFormat] Format to save in
6169-
/// @optionalArg ascii [VipsOption.Boolean] Save as ascii
6170-
/// @optionalArg squash [VipsOption.Boolean] Save as one bit
6171-
/// @optionalArg bitdepth [VipsOption.Int] Set to 1 to write as a 1 bit image
6172-
/// @optionalArg keep [VipsOption.Int] Which metadata to retain
6173-
/// @optionalArg background [VipsOption.ArrayDouble] Background value
6174-
/// @optionalArg page-height [VipsOption.Int] Set page height for multipage save
6175-
/// @optionalArg profile [VipsOption.String] Filename of ICC profile to embed
6176-
/// @optionalArg strip [VipsOption.Boolean] Strip all metadata from image
6177-
@Deprecated(
6178-
forRemoval = true
6179-
)
6180-
public void pbmsaveTarget(VTarget target, VipsOption... args) throws VipsError {
6181-
var inOption = VipsOption.Image("in", this);
6182-
var targetOption = VipsOption.Target("target", target);
6183-
var callArgs = new ArrayList<>(Arrays.asList(args));
6184-
callArgs.add(inOption);
6185-
callArgs.add(targetOption);
6186-
VipsInvoker.invokeOperation(arena, "pbmsave_target", callArgs);
6187-
}
6188-
61896059
/// Render a PDF file into a VIPS image.
61906060
///
61916061
/// The output image is always RGBA -- CMYK PDFs will be
@@ -6367,54 +6237,6 @@ public static VImage perlin(Arena arena, int width, int height, VipsOption... ar
63676237
return outOption.valueOrThrow();
63686238
}
63696239

6370-
/// Save image in pfm format
6371-
/// @param target Target to save to
6372-
/// @param args Array of VipsOption to apply to this operation
6373-
/// @optionalArg format [VipsOption.Enum] [VipsForeignPpmFormat] Format to save in
6374-
/// @optionalArg ascii [VipsOption.Boolean] Save as ascii
6375-
/// @optionalArg squash [VipsOption.Boolean] Save as one bit
6376-
/// @optionalArg bitdepth [VipsOption.Int] Set to 1 to write as a 1 bit image
6377-
/// @optionalArg keep [VipsOption.Int] Which metadata to retain
6378-
/// @optionalArg background [VipsOption.ArrayDouble] Background value
6379-
/// @optionalArg page-height [VipsOption.Int] Set page height for multipage save
6380-
/// @optionalArg profile [VipsOption.String] Filename of ICC profile to embed
6381-
/// @optionalArg strip [VipsOption.Boolean] Strip all metadata from image
6382-
@Deprecated(
6383-
forRemoval = true
6384-
)
6385-
public void pfmsaveTarget(VTarget target, VipsOption... args) throws VipsError {
6386-
var inOption = VipsOption.Image("in", this);
6387-
var targetOption = VipsOption.Target("target", target);
6388-
var callArgs = new ArrayList<>(Arrays.asList(args));
6389-
callArgs.add(inOption);
6390-
callArgs.add(targetOption);
6391-
VipsInvoker.invokeOperation(arena, "pfmsave_target", callArgs);
6392-
}
6393-
6394-
/// Save image in pgm format
6395-
/// @param target Target to save to
6396-
/// @param args Array of VipsOption to apply to this operation
6397-
/// @optionalArg format [VipsOption.Enum] [VipsForeignPpmFormat] Format to save in
6398-
/// @optionalArg ascii [VipsOption.Boolean] Save as ascii
6399-
/// @optionalArg squash [VipsOption.Boolean] Save as one bit
6400-
/// @optionalArg bitdepth [VipsOption.Int] Set to 1 to write as a 1 bit image
6401-
/// @optionalArg keep [VipsOption.Int] Which metadata to retain
6402-
/// @optionalArg background [VipsOption.ArrayDouble] Background value
6403-
/// @optionalArg page-height [VipsOption.Int] Set page height for multipage save
6404-
/// @optionalArg profile [VipsOption.String] Filename of ICC profile to embed
6405-
/// @optionalArg strip [VipsOption.Boolean] Strip all metadata from image
6406-
@Deprecated(
6407-
forRemoval = true
6408-
)
6409-
public void pgmsaveTarget(VTarget target, VipsOption... args) throws VipsError {
6410-
var inOption = VipsOption.Image("in", this);
6411-
var targetOption = VipsOption.Target("target", target);
6412-
var callArgs = new ArrayList<>(Arrays.asList(args));
6413-
callArgs.add(inOption);
6414-
callArgs.add(targetOption);
6415-
VipsInvoker.invokeOperation(arena, "pgmsave_target", callArgs);
6416-
}
6417-
64186240
/// Convert the two input images to Fourier space, calculate phase-correlation,
64196241
/// back to real space.
64206242
///
@@ -6640,30 +6462,6 @@ public void pngsaveTarget(VTarget target, VipsOption... args) throws VipsError {
66406462
VipsInvoker.invokeOperation(arena, "pngsave_target", callArgs);
66416463
}
66426464

6643-
/// Save image in pnm format
6644-
/// @param target Target to save to
6645-
/// @param args Array of VipsOption to apply to this operation
6646-
/// @optionalArg format [VipsOption.Enum] [VipsForeignPpmFormat] Format to save in
6647-
/// @optionalArg ascii [VipsOption.Boolean] Save as ascii
6648-
/// @optionalArg squash [VipsOption.Boolean] Save as one bit
6649-
/// @optionalArg bitdepth [VipsOption.Int] Set to 1 to write as a 1 bit image
6650-
/// @optionalArg keep [VipsOption.Int] Which metadata to retain
6651-
/// @optionalArg background [VipsOption.ArrayDouble] Background value
6652-
/// @optionalArg page-height [VipsOption.Int] Set page height for multipage save
6653-
/// @optionalArg profile [VipsOption.String] Filename of ICC profile to embed
6654-
/// @optionalArg strip [VipsOption.Boolean] Strip all metadata from image
6655-
@Deprecated(
6656-
forRemoval = true
6657-
)
6658-
public void pnmsaveTarget(VTarget target, VipsOption... args) throws VipsError {
6659-
var inOption = VipsOption.Image("in", this);
6660-
var targetOption = VipsOption.Target("target", target);
6661-
var callArgs = new ArrayList<>(Arrays.asList(args));
6662-
callArgs.add(inOption);
6663-
callArgs.add(targetOption);
6664-
VipsInvoker.invokeOperation(arena, "pnmsave_target", callArgs);
6665-
}
6666-
66676465
/// Read a PPM/PBM/PGM/PFM file into a VIPS image.
66686466
///
66696467
/// It can read 1, 8, 16 and 32 bit images, colour or monochrome,

core/src/main/java/app/photofox/vipsffm/VSource.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,6 @@ public int hashCode() {
3636
return address.hashCode();
3737
}
3838

39-
/// @deprecated See [#getUnsafeStructAddress]
40-
@Deprecated(
41-
since = "0.5.10",
42-
forRemoval = true
43-
)
44-
public MemorySegment getUnsafeAddress() {
45-
return this.getUnsafeStructAddress();
46-
}
47-
4839
/// Gets the raw [MemorySegment] (C pointer) for this VipsSource struct
4940
///
5041
/// The memory address' lifetime is bound to the scope of the arena that created it

core/src/main/java/app/photofox/vipsffm/VTarget.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,6 @@ public int hashCode() {
4040
return address.hashCode();
4141
}
4242

43-
/// @deprecated See [#getUnsafeStructAddress]
44-
@Deprecated(
45-
since = "0.5.10",
46-
forRemoval = true
47-
)
48-
public MemorySegment getUnsafeAddress() {
49-
return this.getUnsafeStructAddress();
50-
}
51-
5243
/// Gets the raw [MemorySegment] (C pointer) for this VipsTarget struct
5344
///
5445
/// The memory address' lifetime is bound to the scope of the arena that created it

docs/allclasses-index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
3030
<li><a href="index.html">Overview</a></li>
3131
<li><a href="overview-tree.html">Tree</a></li>
32-
<li><a href="deprecated-list.html">Deprecated</a></li>
3332
<li><a href="index-all.html">Index</a></li>
3433
<li><a href="search.html">Search</a></li>
3534
<li><a href="help-doc.html#all-classes">Help</a></li>

docs/allpackages-index.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
3030
<li><a href="index.html">Overview</a></li>
3131
<li><a href="overview-tree.html">Tree</a></li>
32-
<li><a href="deprecated-list.html">Deprecated</a></li>
3332
<li><a href="index-all.html">Index</a></li>
3433
<li><a href="search.html">Search</a></li>
3534
<li><a href="help-doc.html#all-packages">Help</a></li>

0 commit comments

Comments
 (0)