Skip to content

Fix: disable croping when crop is disabled. resolve #62 #164

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

Open
seyedalireza wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: disable croping when crop is disabled. resolve #62 #164

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
8 changes: 6 additions & 2 deletions simplecropview/src/main/java/com/isseiaoki/simplecropview/CropImageView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,6 +1250,12 @@ private Bitmap getCroppedBitmapFromUri() throws IOException {
}

private Rect calcCropRect(int originalImageWidth, int originalImageHeight) {
int imageW = Math.round(getRotatedWidth(mAngle, originalImageWidth, originalImageHeight));
int imageH = Math.round(getRotatedHeight(mAngle, originalImageWidth, originalImageHeight));

if (!mIsCropEnabled) {
return new Rect(0, 0, imageW, imageH);
}
float scaleToOriginal =
getRotatedWidth(mAngle, originalImageWidth, originalImageHeight) / mImageRect.width();
float offsetX = mImageRect.left * scaleToOriginal;
Expand All @@ -1258,8 +1264,6 @@ private Rect calcCropRect(int originalImageWidth, int originalImageHeight) {
int top = Math.round(mFrameRect.top * scaleToOriginal - offsetY);
int right = Math.round(mFrameRect.right * scaleToOriginal - offsetX);
int bottom = Math.round(mFrameRect.bottom * scaleToOriginal - offsetY);
int imageW = Math.round(getRotatedWidth(mAngle, originalImageWidth, originalImageHeight));
int imageH = Math.round(getRotatedHeight(mAngle, originalImageWidth, originalImageHeight));
return new Rect(Math.max(left, 0), Math.max(top, 0), Math.min(right, imageW),
Math.min(bottom, imageH));
}
Expand Down