Skip to content

update dependencies #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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update dependencies #13

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
2 changes: 1 addition & 1 deletion isolate_image_compress/lib/isolate_image_compress.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
library isolate_image_compress;
library;

export 'src/compress_utils.dart';
export 'src/resize_utils.dart';
Expand Down
26 changes: 13 additions & 13 deletions isolate_image_compress/lib/src/compress_format/compress_gif.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,28 @@ Future<Uint8List> compressGifImage(Uint8List data,
return data;
}

ImageResolution? _resolution = maxResolution ?? ImageResolution.uhd;
ImageResolution? resolution = maxResolution ?? ImageResolution.uhd;

Image? _image = decodeImage(data);
if (_image == null) {
Image? image = decodeImage(data);
if (image == null) {
return Uint8List(0);
} else {
List<int>? _data;
List<int>? data0;
do {
if (_resolution != null) {
_image = _image!.resizeWithResolution(_resolution);
if (resolution != null) {
image = image!.resizeWithResolution(resolution);
print(
'resizeWithResolution: ${_resolution.width} - ${_resolution.height}');
'resizeWithResolution: ${resolution.width} - ${resolution.height}');
}
_data = encodeGif(_image!);
print('encodeGif - length: ${_data.length}');
if (_data.length < maxSize) {
data0 = encodeGif(image!);
print('encodeGif - length: ${data0.length}');
if (data0.length < maxSize) {
break;
}

_resolution = _resolution?.prev();
} while (_resolution != null);
resolution = resolution?.prev();
} while (resolution != null);

return _data.length < maxSize ? Uint8List.fromList(_data) : Uint8List(0);
return data0.length < maxSize ? Uint8List.fromList(data0) : Uint8List(0);
}
}
48 changes: 24 additions & 24 deletions isolate_image_compress/lib/src/compress_format/compress_jpeg.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,46 +19,46 @@ Future<Uint8List> compressJpegImage(Uint8List data,
}

// quality: The JPEG quality, in the range [0, 100] where 100 is highest quality.
const _minQuality = 0;
const _maxQuality = 100;
const _step = 10;
const minQuality = 0;
const maxQuality = 100;
const step = 10;

ImageResolution? _resolution = maxResolution ?? ImageResolution.uhd;
ImageResolution? resolution = maxResolution ?? ImageResolution.uhd;

Image? _image = decodeImage(data);
if (_image == null) {
Image? image = decodeImage(data);
if (image == null) {
return Uint8List(0);
} else {
List<int>? _data;
List<int>? data0;
do {
if (_resolution != null) {
_image = _image!.resizeWithResolution(_resolution);
if (resolution != null) {
image = image!.resizeWithResolution(resolution);
print(
'resizeWithResolution: ${_resolution.width} - ${_resolution.height}');
'resizeWithResolution: ${resolution.width} - ${resolution.height}');
}

_data = encodeJpg(_image!, quality: _maxQuality);
print('encodeJpg - _maxQuality: ${_data.length}');
data0 = encodeJpg(image!, quality: maxQuality);
print('encodeJpg - _maxQuality: ${data0.length}');

if (_data.length > maxSize) {
_data = encodeJpg(_image, quality: _minQuality);
print('encodeJpg - _minQuality: ${_data.length}');
if (data0.length > maxSize) {
data0 = encodeJpg(image, quality: minQuality);
print('encodeJpg - _minQuality: ${data0.length}');

if (_data.length < maxSize) {
int _quality = _maxQuality;
if (data0.length < maxSize) {
int quality = maxQuality;
do {
_quality -= _step;
_data = encodeJpg(_image, quality: _quality);
print('encodeJpg - _quality - $_quality: ${_data.length}');
} while (_data.length > maxSize && _quality > _minQuality);
quality -= step;
data0 = encodeJpg(image, quality: quality);
print('encodeJpg - _quality - $quality: ${data0.length}');
} while (data0.length > maxSize && quality > minQuality);

break;
}
}

_resolution = _resolution?.prev();
} while (_resolution != null);
resolution = resolution?.prev();
} while (resolution != null);

return _data.length < maxSize ? Uint8List.fromList(_data) : Uint8List(0);
return data0.length < maxSize ? Uint8List.fromList(data0) : Uint8List(0);
}
}
48 changes: 24 additions & 24 deletions isolate_image_compress/lib/src/compress_format/compress_png.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,45 +19,45 @@ Future<Uint8List> compressPngImage(Uint8List data,
}

// level: The compression level, in the range [0, 9] where 9 is the most compressed.
const _minLevel = 0;
const _maxLevel = 9;
const _step = 1;
const minLevel = 0;
const maxLevel = 9;
const step = 1;

ImageResolution? _resolution = maxResolution ?? ImageResolution.uhd;
ImageResolution? resolution = maxResolution ?? ImageResolution.uhd;

Image? _image = decodeImage(data);
if (_image == null) {
Image? image = decodeImage(data);
if (image == null) {
return Uint8List(0);
} else {
List<int>? _data;
List<int>? data0;
do {
if (_resolution != null) {
_image = _image!.resizeWithResolution(_resolution);
if (resolution != null) {
image = image!.resizeWithResolution(resolution);
print(
'resizeWithResolution: ${_resolution.width} - ${_resolution.height}');
'resizeWithResolution: ${resolution.width} - ${resolution.height}');
}

_data = encodePng(_image!, level: _minLevel);
print('encodePNG - _minLevel: ${_data.length}');
data0 = encodePng(image!, level: minLevel);
print('encodePNG - _minLevel: ${data0.length}');

if (_data.length > maxSize) {
_data = encodePng(_image, level: _maxLevel);
print('encodePNG - _maxLevel: ${_data.length}');
if (data0.length > maxSize) {
data0 = encodePng(image, level: maxLevel);
print('encodePNG - _maxLevel: ${data0.length}');

if (_data.length < maxSize) {
int _level = _minLevel;
if (data0.length < maxSize) {
int level = minLevel;
do {
_level += _step;
_data = encodePng(_image, level: _level);
print('encodePNG - _level - $_level: ${_data.length}');
} while (_data.length > maxSize && _level < _maxLevel);
level += step;
data0 = encodePng(image, level: level);
print('encodePNG - _level - $level: ${data0.length}');
} while (data0.length > maxSize && level < maxLevel);

break;
}
}
_resolution = _resolution?.prev();
} while (_resolution != null);
resolution = resolution?.prev();
} while (resolution != null);

return _data.length < maxSize ? Uint8List.fromList(_data) : Uint8List(0);
return data0.length < maxSize ? Uint8List.fromList(data0) : Uint8List(0);
}
}
26 changes: 13 additions & 13 deletions isolate_image_compress/lib/src/compress_format/compress_tga.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,28 +18,28 @@ Future<Uint8List> compressTgaImage(Uint8List data,
return data;
}

ImageResolution? _resolution = maxResolution ?? ImageResolution.uhd;
ImageResolution? resolution = maxResolution ?? ImageResolution.uhd;

Image? _image = decodeImage(data);
if (_image == null) {
Image? image = decodeImage(data);
if (image == null) {
return Uint8List(0);
} else {
List<int>? _data;
List<int>? data0;
do {
if (_resolution != null) {
_image = _image!.resizeWithResolution(_resolution);
if (resolution != null) {
image = image!.resizeWithResolution(resolution);
print(
'resizeWithResolution: ${_resolution.width} - ${_resolution.height}');
'resizeWithResolution: ${resolution.width} - ${resolution.height}');
}
_data = encodeTga(_image!);
print('encodeTga - length: ${_data.length}');
if (_data.length < maxSize) {
data0 = encodeTga(image!);
print('encodeTga - length: ${data0.length}');
if (data0.length < maxSize) {
break;
}

_resolution = _resolution?.prev();
} while (_resolution != null);
resolution = resolution?.prev();
} while (resolution != null);

return _data.length < maxSize ? Uint8List.fromList(_data) : Uint8List(0);
return data0.length < maxSize ? Uint8List.fromList(data0) : Uint8List(0);
}
}
52 changes: 26 additions & 26 deletions isolate_image_compress/lib/src/compress_utils.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,33 @@ class CompressParams {
}

Future<Uint8List> _compressImage(CompressParams params) async {
final _maxSize = params.maxSize;
final maxSize = params.maxSize;

// read image data
final Uint8List _fileData =
final Uint8List fileData =
params.imageData ?? params.image?.data ?? Uint8List(0);

if (_fileData.isEmpty || _maxSize == null || _fileData.length < _maxSize) {
if (fileData.isEmpty || maxSize == null || fileData.length < maxSize) {
// not compression
return _fileData;
return fileData;
} else {
final _maxResolution = params.maxResolution;
final maxResolution = params.maxResolution;

Decoder? _decoder =
Decoder? decoder =
(params.format != null ? _getDecoder(params.format!) : null) ??
findDecoderForData(_fileData);
if (_decoder is JpegDecoder) {
return compressJpegImage(_fileData,
maxSize: _maxSize, maxResolution: _maxResolution);
} else if (_decoder is PngDecoder) {
return compressPngImage(_fileData,
maxSize: _maxSize, maxResolution: _maxResolution);
} else if (_decoder is TgaDecoder) {
return compressTgaImage(_fileData,
maxSize: _maxSize, maxResolution: _maxResolution);
} else if (_decoder is GifDecoder) {
return compressGifImage(_fileData,
maxSize: _maxSize, maxResolution: _maxResolution);
findDecoderForData(fileData);
if (decoder is JpegDecoder) {
return compressJpegImage(fileData,
maxSize: maxSize, maxResolution: maxResolution);
} else if (decoder is PngDecoder) {
return compressPngImage(fileData,
maxSize: maxSize, maxResolution: maxResolution);
} else if (decoder is TgaDecoder) {
return compressTgaImage(fileData,
maxSize: maxSize, maxResolution: maxResolution);
} else if (decoder is GifDecoder) {
return compressGifImage(fileData,
maxSize: maxSize, maxResolution: maxResolution);
}

return Uint8List(0);
Expand All @@ -74,7 +74,7 @@ Future<Uint8List> _compressImage(CompressParams params) async {

Decoder? _getDecoder(ImageFormat format) {
switch (format) {
case ImageFormat.jpeg:
case ImageFormat.jpg:
return JpegDecoder();
case ImageFormat.png:
return PngDecoder();
Expand All @@ -99,12 +99,12 @@ extension CompressOnIsolateImage on IsolateImage {
{int? maxSize,
ImageResolution? maxResolution,
ImageFormat? format}) async {
final CompressParams _params = CompressParams(
final CompressParams params = CompressParams(
image: this,
maxSize: maxSize,
maxResolution: maxResolution,
format: format);
return IsolateFlutter.createAndStart(_compressImage, _params,
return IsolateFlutter.createAndStart(_compressImage, params,
debugLabel: 'isolate_image_compress');
}
}
Expand All @@ -117,12 +117,12 @@ extension CompressOnUint8List on Uint8List {
/// - [format] - the image format you want to compress. (optional).
Future<Uint8List?> compress(
{int? maxSize, ImageResolution? resolution, ImageFormat? format}) async {
final CompressParams _params = CompressParams(
final CompressParams params = CompressParams(
imageData: this,
maxSize: maxSize,
maxResolution: resolution,
format: format);
return IsolateFlutter.createAndStart(_compressImage, _params,
return IsolateFlutter.createAndStart(_compressImage, params,
debugLabel: 'isolate_image_compress');
}
}
Expand All @@ -135,12 +135,12 @@ extension CompressOnListInt on List<int> {
/// - [format] - the image format you want to compress. (optional).
Future<Uint8List?> compress(
{int? maxSize, ImageResolution? resolution, ImageFormat? format}) async {
final CompressParams _params = CompressParams(
final CompressParams params = CompressParams(
imageData: Uint8List.fromList(this),
maxSize: maxSize,
maxResolution: resolution,
format: format);
return IsolateFlutter.createAndStart(_compressImage, _params,
return IsolateFlutter.createAndStart(_compressImage, params,
debugLabel: 'isolate_image_compress');
}
}
13 changes: 6 additions & 7 deletions isolate_image_compress/lib/src/constants/enums.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
enum ImageFromType { file, path }
enum ImageFormat { png, jpeg, gif, tga }

class ImageResolution {
final int width;
Expand Down Expand Up @@ -28,17 +27,17 @@ class ImageResolution {
static const List<ImageResolution> all = [sd, hd, fhd, qhd, uhd, fuhd];

ImageResolution? prev() {
final _index = all.indexOf(this);
if (_index > 0) {
return all[_index - 1];
final index = all.indexOf(this);
if (index > 0) {
return all[index - 1];
}
return null;
}

ImageResolution? next() {
final _index = all.indexOf(this);
if (_index < all.length - 1) {
return all[_index + 1];
final index = all.indexOf(this);
if (index < all.length - 1) {
return all[index + 1];
}
return null;
}
Expand Down
Loading