nakarte

Source code of https://map.sikmir.ru (fork)
git clone git://git.sikmir.ru/nakarte
Log | Files | Refs | LICENSE

commit 01e682802d1ad4733f65c6a3ebc740290e262089
parent 3bba1ed41babf9d79ee396d09cab88a719ed1e8e
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Tue,  7 Mar 2017 11:57:57 +0300

Revert "Revert "[print] use less memory when blending tracks""

This reverts commit 4b42973dad5e3dc877590d28a8cc5b2b47b0d0ef.

Diffstat:
Msrc/lib/leaflet.control.printPages/map-render.js | 61+++++++++++++++++++++++++++++++++++--------------------------
1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/lib/leaflet.control.printPages/map-render.js b/src/lib/leaflet.control.printPages/map-render.js @@ -59,35 +59,44 @@ function getLayersForPrint(map, xhrQueue) { } function blendMultiplyCanvas(src, dest) { - var s_data = src.getContext('2d').getImageData(0, 0, src.width, src.height).data; - var d_image_data = dest.getContext('2d').getImageData(0, 0, src.width, src.height); - var d_data = d_image_data.data; - var data_length = s_data.length, - sr, sg, sb, sa, - dr, dg, db, - l; - for (var i = 0; i < data_length; i += 4) { - sa = s_data[i + 3]; - if (sa) { - sr = s_data[i]; - sg = s_data[i + 1]; - sb = s_data[i + 2]; - dr = d_data[i]; - dg = d_data[i + 1]; - db = d_data[i + 2]; + if (src.width !== dest.width || src.height !== dest.height) { + throw new Error('Canvas size mismatch'); + } + const height = src.height; + let srcContext = src.getContext('2d'); + let destContext = dest.getContext('2d'); + for (let y = 0; y < height; y++) { + let s_data = srcContext.getImageData(0, y, src.width, 1).data; + let d_image_data = destContext.getImageData(0, y, src.width, 1); + let d_data = d_image_data.data; + let data_length = s_data.length, + sr, sg, sb, sa, + dr, dg, db, + l; + for (let i = 0; i < data_length; i += 4) { + sa = s_data[i + 3]; + if (sa) { + sr = s_data[i]; + sg = s_data[i + 1]; + sb = s_data[i + 2]; + dr = d_data[i]; + dg = d_data[i + 1]; + db = d_data[i + 2]; - l = (dr + dg + db) / 3; - l = l / 255 * 192 + 63; - dr = sr / 255 * l; - dg = sg / 255 * l; - db = sb / 255 * l; + l = (dr + dg + db) / 3; + l = l / 255 * 192 + 63; + dr = sr / 255 * l; + dg = sg / 255 * l; + db = sb / 255 * l; + + d_data[i] = dr; + d_data[i + 1] = dg; + d_data[i + 2] = db; + } + } + dest.getContext('2d').putImageData(d_image_data, 0, y); - d_data[i] = dr; - d_data[i + 1] = dg; - d_data[i + 2] = db; - } } - dest.getContext('2d').putImageData(d_image_data, 0, 0); } class PageComposer {