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

[android] fix djl version for android #3526

Merged
merged 1 commit into from
Nov 16, 2024
Merged

[android] fix djl version for android #3526

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
29 changes: 29 additions & 0 deletions android/core/src/main/java/ai/djl/android/core/BitmapImageFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,35 @@ public void drawBoundingBoxes(DetectedObjects detections, float opacity) {
oldBitmap.recycle();
}

/** {@inheritDoc} */
@Override
public void drawRectangle(Rectangle rect, int rgb, int thickness) {
Bitmap mutableBitmap = bitmap.copy(Bitmap.Config.ARGB_8888, true);
Canvas canvas = new Canvas(mutableBitmap);
int color = darker(rgb);

// set the paint configure
Paint paint = new Paint();
paint.setStyle(Paint.Style.STROKE);
paint.setStrokeWidth(thickness);
paint.setAntiAlias(true);
paint.setColor(color);

int imageWidth = mutableBitmap.getWidth();
int imageHeight = mutableBitmap.getHeight();
int x = (int) (rect.getX() * imageWidth);
int y = (int) (rect.getY() * imageHeight);
canvas.drawRect(
x,
y,
x + (int) (rect.getWidth() * imageWidth),
y + (int) (rect.getHeight() * imageHeight),
paint);
Bitmap oldBitmap = bitmap;
bitmap = mutableBitmap;
oldBitmap.recycle();
}

/** {@inheritDoc} */
@Override
public void drawMarks(List<Point> points, int radius) {
Expand Down
4 changes: 2 additions & 2 deletions android/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
djl_version=0.30.0
pytorch_version=2.4.0
djl_version=0.31.0
pytorch_version=2.5.1
Loading