Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 44 additions & 1 deletion src/shapes/Image.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,59 @@
// call super constructor
Kinetic.Shape.call(this, config);
this.className = IMAGE;

// Get vertical squash ratio
var image = this.getImage(),
verticalSquashRatio;
// 1) If this the browser is WebKit &&
// 2) This isn't an SVG image (https://code.google.com/p/chromium/issues/detail?id=68568) &&
// 3) This isn't cross origin image
if (image &&
Kinetic.UA.browser == 'webkit' &&
image.src.indexOf(".svg") == -1 &&
(image.src.indexOf("http") == -1 || image.src.indexOf(location.hostname) !== -1)) {
verticalSquashRatio = this.detectVerticalSquash(image);
if (verticalSquashRatio !== 1) this.setHeight(this.getHeight() / verticalSquashRatio);
}
},
_useBufferCanvas: function() {
return (this.hasShadow() || this.getAbsoluteOpacity() !== 1) && this.hasStroke();
},
/**
* Function used to fix a bug where large images get squashed in iOS 6 & 7
* Credit: https://github.com/stomita/ios-imagefile-megapixel
*/
detectVerticalSquash: function(img) {
var iw = img.naturalWidth, ih = img.naturalHeight;
var canvas = document.createElement('canvas');
canvas.width = 1;
canvas.height = ih;
var ctx = canvas.getContext('2d');
ctx.drawImage(img, 0, 0);
var data = ctx.getImageData(0, 0, 1, ih).data;
var sy = 0;
var ey = ih;
var py = ih;
while (py > sy) {
var alpha = data[(py - 1) * 4 + 3];
if (alpha === 0) {
ey = py;
} else {
sy = py;
}
py = (ey + sy) >> 1;
}
var ratio = (py / ih);
return (ratio===0)?1:ratio;
},
drawFunc: function(context) {
var width = this.getWidth(),
height = this.getHeight(),
that = this,
crop,
params,
image;
image,
verticalSquashRatio;

//TODO: this logic needs to hook int othe new caching system

Expand All @@ -69,6 +111,7 @@
image = this.getImage();

if (image) {

crop = this.getCrop();
if (crop) {
crop.x = crop.x || 0;
Expand Down
Binary file added test/assets/diana.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions test/unit/shapes/Image-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -379,4 +379,43 @@ suite('Image', function(){
};
imageObj.src = 'assets/darth-vader.jpg';
});

// ======================================================
test('load large image in iOS 6 or iOS 7 (NOTE: Run tests in iOS 6 or 7 to check)', function(done) {

var container = document.createElement('div');

var stage = new Kinetic.Stage({
container: container,
width: 3264/3,
height: 2448/3,
scale: 1/3
});

kineticContainer.appendChild(container);

var layer = new Kinetic.Layer();

var imageObj = new Image();

imageObj.onload = function() {
var diana = new Kinetic.Image({
x: 0,
y: 0,
image: imageObj,
width: 3264,
height: 2448
});
layer.add(diana);
stage.add(layer);
var ctx = diana.getContext();
var data = ctx.getImageData(0, 2447/3, 1, 1).data;
assert.notEqual(data[3], 0);
done();
};

imageObj.src = 'assets/diana.jpg';

});

});