Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master

This commit is contained in:
Agetian
2018-12-09 12:52:29 +03:00
16 changed files with 278 additions and 82 deletions

View File

@@ -9,6 +9,8 @@ import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.net.ConnectivityManager;
import android.net.NetworkInfo;
import android.net.Uri;
@@ -28,6 +30,8 @@ import forge.util.FileUtil;
import forge.util.ThreadUtil;
import java.io.File;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.concurrent.Callable;
public class Main extends AndroidApplication {
@@ -243,5 +247,11 @@ public class Main extends AndroidApplication {
}
});
}
@Override
public void convertToJPEG(InputStream input, OutputStream output) {
Bitmap bmp = BitmapFactory.decodeStream(input);
bmp.compress(Bitmap.CompressFormat.JPEG, 100, output);
}
}
}