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 compilation issue in LeptonicaFrameConverter #1791

Merged
merged 2 commits into from
Apr 4, 2022
Merged

Fix compilation issue in LeptonicaFrameConverter #1791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc546ed
Fix compilation issue in LeptonicaFrameConverter
HolgerMassmann Apr 4, 2022
495c227
Update CHANGELOG.md
saudet Apr 4, 2022
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Update `FFmpegStreamingTimeout` sample to use `timeout` instead of `stimeout` for RTSP ([pull #1758](https://github.com/bytedeco/javacv/pull/1758))
* Restore static calls to `FFmpegFrameGrabber.tryLoad()` and `FFmpegFrameRecorder.tryLoad()` ([issue #1756](https://github.com/bytedeco/javacv/issues/1756))
* Enable by default on `RealSense2FrameGrabber.start()` all color, depth, and IR streams as `videoStream` ([pull #1750](https://github.com/bytedeco/javacv/pull/1750))
* Upgrade dependencies for OpenBLAS 0.3.20, Tesseract 5.1.0
* Upgrade dependencies for OpenBLAS 0.3.20, Leptonica 1.82.0 ([pull #1791](https://github.com/bytedeco/javacv/pull/1791)), Tesseract 5.1.0

### February 11, 2022 version 1.5.7
* Fix accuracy and latency issues with `FFmpegFrameGrabber.setVideoFrameNumber()` ([pull #1734](https://github.com/bytedeco/javacv/pull/1734))
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/bytedeco/javacv/LeptonicaFrameConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import org.bytedeco.javacpp.Pointer;

import org.bytedeco.leptonica.*;
import static org.bytedeco.leptonica.global.lept.*;
import static org.bytedeco.leptonica.global.leptonica.*;

/**
* A utility class to map data between {@link Frame} and {@link PIX},
Expand All @@ -40,7 +40,7 @@
* @author Samuel Audet
*/
public class LeptonicaFrameConverter extends FrameConverter<PIX> {
static { Loader.load(org.bytedeco.leptonica.global.lept.class); }
static { Loader.load(org.bytedeco.leptonica.global.leptonica.class); }

PIX pix;
BytePointer frameData, pixData;
Expand Down