scratchfoundation/scratch-paint
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-paint.git synced 2024-12-22 21:42:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #968 from paulkaplan/fix-eyedropper-crash

Browse source 
Fix Safari crash in color picker
This commit is contained in:
DD Liu 2020-02-04 18:49:24 -05:00 committed by GitHub
commit 56e0332ed2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/components/loupe/loupe.jsx
View file

@ -41,7 +41,16 @@ class LoupeComponent extends React.Component {
const imageData = tmpCtx.createImageData( const imageData = tmpCtx.createImageData(
loupeDiameter, loupeDiameter loupeDiameter, loupeDiameter
); );
imageData.data.set(this.props.colorInfo.data);
// Since the color info comes from elsewhere there is no guarantee
// about the size. Make sure it matches to prevent data.set from throwing.
// See issue #966 for example of how that can happen.
if (this.props.colorInfo.data.length === imageData.data.length) {
imageData.data.set(this.props.colorInfo.data);
} else {
console.warn('Image data size mismatch drawing loupe'); // eslint-disable-line no-console
}
tmpCtx.putImageData(imageData, 0, 0); tmpCtx.putImageData(imageData, 0, 0);
// Scale the loupe canvas and draw the zoomed image // Scale the loupe canvas and draw the zoomed image

4
src/helper/tools/eye-dropper.js
View file

@ -99,8 +99,8 @@ class EyeDropperTool extends paper.Tool {
y: y, y: y,
color: colors.data, color: colors.data,
data: bufferContext.getImageData( data: bufferContext.getImageData(
(artX * ZOOM_SCALE) - (LOUPE_RADIUS * ZOOM_SCALE), ZOOM_SCALE * (artX - LOUPE_RADIUS),
(artY * ZOOM_SCALE) - (LOUPE_RADIUS * ZOOM_SCALE), ZOOM_SCALE * (artY - LOUPE_RADIUS),
LOUPE_RADIUS * 2 * ZOOM_SCALE, LOUPE_RADIUS * 2 * ZOOM_SCALE,
LOUPE_RADIUS * 2 * ZOOM_SCALE LOUPE_RADIUS * 2 * ZOOM_SCALE
).data, ).data,