small fixes; image-library-example is now doing something more reasonable
This commit is contained in:
parent
1deed94e04
commit
89715e48b5
|
@ -78,6 +78,7 @@ var checkByte = plt.baselib.check.checkByte;
|
||||||
var checkReal = plt.baselib.check.checkReal;
|
var checkReal = plt.baselib.check.checkReal;
|
||||||
var checkBoolean = plt.baselib.check.checkBoolean;
|
var checkBoolean = plt.baselib.check.checkBoolean;
|
||||||
|
|
||||||
|
var checkNatural = plt.baselib.check.checkNatural;
|
||||||
var checkNonNegativeReal = plt.baselib.check.checkNonNegativeReal;
|
var checkNonNegativeReal = plt.baselib.check.checkNonNegativeReal;
|
||||||
|
|
||||||
|
|
||||||
|
@ -453,6 +454,8 @@ EXPORTS['beside'] =
|
||||||
for (var i = 0; i < restImages.length; i++) {
|
for (var i = 0; i < restImages.length; i++) {
|
||||||
img = makeOverlayImage(img, restImages[i], "beside", "middle");
|
img = makeOverlayImage(img, restImages[i], "beside", "middle");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return img;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
|
@ -462,7 +465,7 @@ EXPORTS['beside/align'] =
|
||||||
plt.baselib.arity.makeArityAtLeast(3),
|
plt.baselib.arity.makeArityAtLeast(3),
|
||||||
function(MACHINE) {
|
function(MACHINE) {
|
||||||
var placeY = checkPlaceY(MACHINE, "beside/align", 0);
|
var placeY = checkPlaceY(MACHINE, "beside/align", 0);
|
||||||
var img1 = checkImage(MACHINE, "beside/align", "image", 1);
|
var img1 = checkImage(MACHINE, "beside/align", 1);
|
||||||
var img2 = checkImage(MACHINE, "beside/align", 2);
|
var img2 = checkImage(MACHINE, "beside/align", 2);
|
||||||
var restImages = [];
|
var restImages = [];
|
||||||
for (var i = 3; i < MACHINE.argcount; i++) {
|
for (var i = 3; i < MACHINE.argcount; i++) {
|
||||||
|
@ -870,7 +873,7 @@ EXPORTS['isosceles-triangle'] =
|
||||||
4,
|
4,
|
||||||
function(MACHINE) {
|
function(MACHINE) {
|
||||||
var side = checkNonNegativeReal(MACHINE, "isosceles-triangle", 0);
|
var side = checkNonNegativeReal(MACHINE, "isosceles-triangle", 0);
|
||||||
var angle = checkAngle(MACHINE, "isosceles-triangle", 0);
|
var angle = checkAngle(MACHINE, "isosceles-triangle", 1);
|
||||||
var s = checkMode(MACHINE, "isosceles-triangle", 2);
|
var s = checkMode(MACHINE, "isosceles-triangle", 2);
|
||||||
var c = checkColor(MACHINE, "isosceles-triangle", 3);
|
var c = checkColor(MACHINE, "isosceles-triangle", 3);
|
||||||
return makeTriangleImage(jsnums.toFixnum(side),
|
return makeTriangleImage(jsnums.toFixnum(side),
|
||||||
|
@ -978,7 +981,7 @@ EXPORTS['color-list->image'] =
|
||||||
'color-list->image',
|
'color-list->image',
|
||||||
5,
|
5,
|
||||||
function(MACHINE) {
|
function(MACHINE) {
|
||||||
var listOfColors = checkListOfColor(MACHINE, 'color-list->image', 0);
|
var listOfColors = checkListofColor(MACHINE, 'color-list->image', 0);
|
||||||
var width = checkNatural(MACHINE, 'color-list->image', 1);
|
var width = checkNatural(MACHINE, 'color-list->image', 1);
|
||||||
var height = checkNatural(MACHINE, 'color-list->image', 2);
|
var height = checkNatural(MACHINE, 'color-list->image', 2);
|
||||||
var pinholeX = checkNatural(MACHINE, 'color-list->image', 3);
|
var pinholeX = checkNatural(MACHINE, 'color-list->image', 3);
|
||||||
|
|
|
@ -1388,13 +1388,13 @@ LineImage.prototype.equals = function(other, aUnionFind) {
|
||||||
|
|
||||||
var imageToColorList = function(img) {
|
var imageToColorList = function(img) {
|
||||||
var width = img.getWidth(),
|
var width = img.getWidth(),
|
||||||
height = img.getHeight(),
|
height = img.getHeight(),
|
||||||
canvas = makeCanvas(width, height),
|
canvas = makeCanvas(width, height),
|
||||||
ctx = canvas.getContext("2d"),
|
ctx = canvas.getContext("2d"),
|
||||||
imageData,
|
imageData,
|
||||||
data,
|
data,
|
||||||
i,
|
i,
|
||||||
r, g, b, a;
|
r, g, b, a;
|
||||||
img.render(ctx, 0, 0);
|
img.render(ctx, 0, 0);
|
||||||
imageData = ctx.getImageData(0, 0, width, height);
|
imageData = ctx.getImageData(0, 0, width, height);
|
||||||
data = imageData.data;
|
data = imageData.data;
|
||||||
|
@ -1488,16 +1488,16 @@ var makeRotateImage = function(angle, img) {
|
||||||
return new RotateImage(angle, img);
|
return new RotateImage(angle, img);
|
||||||
};
|
};
|
||||||
var makeScaleImage = function(xFactor, yFactor, img) {
|
var makeScaleImage = function(xFactor, yFactor, img) {
|
||||||
return new ScaleImage(xFactor, yFactor, img);
|
return new ScaleImage(xFactor, yFactor, img);
|
||||||
};
|
};
|
||||||
var makeCropImage = function(x, y, width, height, img) {
|
var makeCropImage = function(x, y, width, height, img) {
|
||||||
return new CropImage(x, y, width, height, img);
|
return new CropImage(x, y, width, height, img);
|
||||||
};
|
};
|
||||||
var makeFrameImage = function(img) {
|
var makeFrameImage = function(img) {
|
||||||
return new FrameImage(img);
|
return new FrameImage(img);
|
||||||
};
|
};
|
||||||
var makeFlipImage = function(img, direction) {
|
var makeFlipImage = function(img, direction) {
|
||||||
return new FlipImage(img, direction);
|
return new FlipImage(img, direction);
|
||||||
};
|
};
|
||||||
var makeTextImage = function(msg, size, color, face, family, style, weight, underline) {
|
var makeTextImage = function(msg, size, color, face, family, style, weight, underline) {
|
||||||
return new TextImage(msg, size, color, face, family, style, weight, underline);
|
return new TextImage(msg, size, color, face, family, style, weight, underline);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user