Commit 466868f0 authored by Gabriel Monnerat's avatar Gabriel Monnerat

erp5_document_scanner: move the caman code into a separate function, where the...

erp5_document_scanner: move the caman code into a separate function, where the promise canceller will cleanup the memory
parent f995e86c
......@@ -84,10 +84,13 @@ div[data-gadget-url$="gadget_document_scanner.html"] > .camera > .thumbnail-list
}
div[data-gadget-url$="gadget_document_scanner.html"] .show-img {
width: 100%;
padding-left: 0.2em;
padding-top: 0.2em;
width: 6em;
height: 6em;
object-fit: cover;
float: left;
}
div[data-gadget-url$="gadget_document_scanner.html"] .thumbnail-list > button {
......@@ -102,6 +105,7 @@ div[data-gadget-url$="gadget_document_scanner.html"] .upload-error {
div[data-gadget-url$="gadget_document_scanner.html"] .new-btn {
display: inline-grid !important;
margin-left: 0.2em;
margin-top: 0.2em;
border: 1px solid rgba(0, 0, 0, 0.14);
border-radius: 0.325em;
width: 6em;
......@@ -113,7 +117,11 @@ div[data-gadget-url$="gadget_document_scanner.html"] .img-container {
max-width: 100%;
}
div[data-gadget-url$="gadget_document_scanner.html"] .img-container img {
/* This is important */
width: 100%;
}
\ No newline at end of file
div[data-gadget-url$="gadget_document_scanner.html"] .btn-thumbnail:before {
color: #000;
position: absolute;
transform: translate(-50%, -50%);
-ms-transform: translate(-50%, -50%);
text-align: center;
font-size: 16pt;
}
......@@ -244,7 +244,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>981.60817.7698.61030</string> </value>
<value> <string>981.61366.62222.30037</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>1582038920.76</float>
<float>1582071888.35</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -50,6 +50,45 @@
return new RSVP.Promise(waitForStream, canceller);
}
function handleCaman(canvas, settings) {
var local_caman;
function canceller() {
// It's weird but Caman stores a lot of data
// in this variables. Please, double check before remove
// this code
local_caman.pixelData = null;
local_caman.originalPixelData = null;
local_caman.renderer.modPixelData = null;
local_caman.imageData = null;
local_caman.initializedPixelData = null;
// Clear caman as much as possible
local_caman = null;
caman.Store.flush(true);
}
return new Promise(function (resolve) {
// XXX the correct usage is `new Caman()` but the library does not support it
local_caman = caman(canvas, null, function () {
if (settings.brightness && settings.brightness !== 0) {
this.brightness(settings.brightness);
}
if (settings.contrast && settings.contrast !== 0) {
this.contrast(settings.contrast);
}
if (settings.enable_greyscale) {
this.greyscale();
}
this.render(function () {
// XXX canceller should be called automatically
canceller();
resolve([this.context.canvas, settings.compression]);
});
});
return local_caman;
}, canceller);
}
function handleCropper(element, data, callback) {
var cropper;
......@@ -200,8 +239,11 @@
}
if (gadget.state['blob_state_' + i] === "saving") {
btn_class = "ui-btn-icon-left ui-icon-spinner";
btn_class = "btn-thumbnail ui-btn-icon-top ui-icon-spinner";
} else {
btn_class = "btn-thumbnail";
}
thumbnail_dom_list.push(domsugar('button', {
type: "button",
"class": btn_class,
......@@ -209,8 +251,8 @@
// or do not allow to show saving image (to simplify button management)
disabled: (i === gadget.state.page) || (gadget.state['blob_state_' + i] === 'saving')
}, [domsugar("img", {"class": img_class,
'data-page': i,
src: gadget.state['blob_url_' + i]})]));
'data-page': i,
src: gadget.state['blob_url_' + i]})]));
}
}
thumbnail_dom_list.push(domsugar('button', {type: 'button',
......@@ -299,8 +341,7 @@
image_capture = new window.ImageCapture(
gadget.element.querySelector('video').srcObject.getVideoTracks()[0]
),
div,
local_caman;
div;
return new RSVP.Queue()
.push(function () {
......@@ -320,34 +361,7 @@
canvas.height = bitmap.height;
canvas.getContext('2d').drawImage(bitmap, 0, 0);
if (settings.brightness || settings.contrast || settings.enable_greyscale || settings.compression) {
return new RSVP.Queue()
.push(function (result) {
return new Promise(function (resolve) {
// XXX the correct usage is `new Caman()` but the library does not support it
local_caman = caman(canvas, null, function () {
if (settings.brightness && settings.brightness !== 0) {
this.brightness(settings.brightness);
}
if (settings.contrast && settings.contrast !== 0) {
this.contrast(settings.contrast);
}
if (settings.enable_greyscale) {
this.greyscale();
}
this.render(function () {
// It's weird but Caman store a lot of data
// in this variables. Please, double check before remove
// this code
this.pixelData = null;
this.originalPixelData = null;
this.renderer.modPixelData = null;
this.imageData = null;
this.initializedPixelData = null;
resolve([this.context.canvas, settings.compression]);
});
});
});
});
return handleCaman(canvas, settings);
}
return [canvas, settings.compression];
})
......@@ -355,9 +369,6 @@
var canvas = result_list[0],
compression = settings.compression || 1;
// Clear caman as much as possible
local_caman = null;
caman.Store.flush(true);
return RSVP.all([
gadget.getTranslationList(["Delete", "Save"]),
new Promise(function (resolve) {
......
......@@ -244,7 +244,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>981.60657.60687.48896</string> </value>
<value> <string>981.61472.39170.22050</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -262,7 +262,7 @@
</tuple>
<state>
<tuple>
<float>1582029620.49</float>
<float>1582078293.94</float>
<string>UTC</string>
</tuple>
</state>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment