Skip to content

Fix SDK version condition for setLayerType call #13

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
thebaer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix SDK version condition for setLayerType call #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04283e3
Fix SDK version condition for setLayerType call
thebaer Aug 20, 2013
1aab8bc
Allow cropping without overwriting supplied image
thebaer Aug 20, 2013
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
11 changes: 7 additions & 4 deletions simple-crop-image-lib/src/eu/janmuller/android/simplecropimage/CropImage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public class CropImage extends MonitoredActivity {

private static final String TAG = "CropImage";
public static final String IMAGE_PATH = "image-path";
public static final String SAVE_IMAGE_PATH = "save-image-path";
public static final String SCALE = "scale";
public static final String ORIENTATION_IN_DEGREES = "orientation_in_degrees";
public static final String ASPECT_X = "aspectX";
Expand Down Expand Up @@ -88,6 +89,7 @@ public class CropImage extends MonitoredActivity {
private ContentResolver mContentResolver;
private Bitmap mBitmap;
private String mImagePath;
private String mSaveImagePath;

boolean mWaitingToPick; // Whether we are wait the user to pick a face.
boolean mSaving; // Whether the "save" button is already clicked.
Expand Down Expand Up @@ -119,18 +121,19 @@ public void onCreate(Bundle icicle) {

if (extras.getString(CIRCLE_CROP) != null) {

if (Build.VERSION.SDK_INT > Build.VERSION_CODES.HONEYCOMB) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
mImageView.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
}
}

mCircleCrop = true;
mAspectX = 1;
mAspectY = 1;
}

mImagePath = extras.getString(IMAGE_PATH);
mSaveImagePath = extras.getString(SAVE_IMAGE_PATH);

mSaveUri = getImageUri(mImagePath);
mSaveUri = getImageUri(mSaveImagePath != null ? mSaveImagePath : mImagePath);
mBitmap = getBitmap(mImagePath);

if (extras.containsKey(ASPECT_X) && extras.get(ASPECT_X) instanceof Integer) {
Expand Down Expand Up @@ -434,7 +437,7 @@ private void saveOutput(Bitmap croppedImage) {
Bundle extras = new Bundle();
Intent intent = new Intent(mSaveUri.toString());
intent.putExtras(extras);
intent.putExtra(IMAGE_PATH, mImagePath);
intent.putExtra(IMAGE_PATH, mSaveImagePath != null ? mSaveImagePath : mImagePath);
intent.putExtra(ORIENTATION_IN_DEGREES, Util.getOrientationInDegree(this));
setResult(RESULT_OK, intent);
} else {
Expand Down