external-repos/squoosh
1
0
Fork 1
mirror of https://github.com/GoogleChromeLabs/squoosh.git synced 2025-11-12 08:47:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up imagquant codec

Browse Source
This commit is contained in:
Surma
2018-08-01 12:19:44 +01:00
parent b3f3ecbf28
commit dce4fc70ac
4 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
codecs/imagequant/example.html
View File

@@ -25,7 +25,6 @@
quantize: Module.cwrap('quantize', '', ['number', 'number', 'number', 'number', 'number']), quantize: Module.cwrap('quantize', '', ['number', 'number', 'number', 'number', 'number']),
free_result: Module.cwrap('free_result', '', ['number']), free_result: Module.cwrap('free_result', '', ['number']),
get_result_pointer: Module.cwrap('get_result_pointer', 'number', []), get_result_pointer: Module.cwrap('get_result_pointer', 'number', []),
// get_result_size: Module.cwrap('get_result_size', 'number', []),
}; };
console.log('Version:', api.version().toString(16)); console.log('Version:', api.version().toString(16));
const image = await loadImage('../example.png'); const image = await loadImage('../example.png');

22
codecs/imagequant/imagequant.c
View File

@@ -24,7 +24,7 @@ void destroy_buffer(uint8_t* p) {
liq_attr *attr; liq_attr *attr;
liq_image *image; liq_image *image;
liq_result *res; liq_result *res;
int result[2]; int result;
EMSCRIPTEN_KEEPALIVE EMSCRIPTEN_KEEPALIVE
void quantize(uint8_t* image_buffer, int image_width, int image_height, int num_colors, float dithering) { void quantize(uint8_t* image_buffer, int image_width, int image_height, int num_colors, float dithering) {
int size = image_width * image_height; int size = image_width * image_height;
@@ -34,15 +34,15 @@ void quantize(uint8_t* image_buffer, int image_width, int image_height, int num_
liq_image_quantize(image, attr, &res); liq_image_quantize(image, attr, &res);
liq_set_dithering_level(res, dithering); liq_set_dithering_level(res, dithering);
uint8_t* image8bit = (uint8_t*) malloc(size); uint8_t* image8bit = (uint8_t*) malloc(size);
result[0] = (int) malloc(size * 4); result = (int) malloc(size * 4);
liq_write_remapped_image(res, image, image8bit, size); liq_write_remapped_image(res, image, image8bit, size);
const liq_palette *pal = liq_get_palette(res); const liq_palette *pal = liq_get_palette(res);
// Turn palletted image back into an RGBA image // Turn palletted image back into an RGBA image
for(int i = 0; i < size; i++) { for(int i = 0; i < size; i++) {
((uint8_t*)result[0])[i * 4 + 0] = pal->entries[image8bit[i]].r; ((uint8_t*)result)[i * 4 + 0] = pal->entries[image8bit[i]].r;
((uint8_t*)result[0])[i * 4 + 1] = pal->entries[image8bit[i]].g; ((uint8_t*)result)[i * 4 + 1] = pal->entries[image8bit[i]].g;
((uint8_t*)result[0])[i * 4 + 2] = pal->entries[image8bit[i]].b; ((uint8_t*)result)[i * 4 + 2] = pal->entries[image8bit[i]].b;
((uint8_t*)result[0])[i * 4 + 3] = pal->entries[image8bit[i]].a; ((uint8_t*)result)[i * 4 + 3] = pal->entries[image8bit[i]].a;
} }
free(image8bit); free(image8bit);
liq_result_destroy(res); liq_result_destroy(res);
@@ -52,16 +52,10 @@ void quantize(uint8_t* image_buffer, int image_width, int image_height, int num_
EMSCRIPTEN_KEEPALIVE EMSCRIPTEN_KEEPALIVE
void free_result() { void free_result() {
free(result[0]); free(result);
} }
EMSCRIPTEN_KEEPALIVE EMSCRIPTEN_KEEPALIVE
int get_result_pointer() { int get_result_pointer() {
return result[0]; return result;
} }
EMSCRIPTEN_KEEPALIVE
int get_result_palette_pointer() {
return result[1];
}

2
codecs/imagequant/imagequant.js
View File

File diff suppressed because one or more lines are too long

BIN
codecs/imagequant/imagequant.wasm
View File

Binary file not shown.