tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add generated change

Browse Source
This commit is contained in:
pengfei.zhou 2021-11-29 13:46:42 +08:00 committed by osborn
parent 96266921ff
commit 5b5500b6e0
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doric-js/bundle/doric-lib.es5.js
View File

@ -2316,9 +2316,6 @@ var Image = /** @class */ (function (_super) {
Image.prototype.getImagePixels = function (context) { Image.prototype.getImagePixels = function (context) {
return this.nativeChannel(context, "getImagePixels")(); return this.nativeChannel(context, "getImagePixels")();
}; };
<<<<<<< HEAD
__decorate$b([
=======
Image.prototype.setImagePixels = function (context, imagePixels) { Image.prototype.setImagePixels = function (context, imagePixels) {
if (Environment.platform === 'iOS') { if (Environment.platform === 'iOS') {
imagePixels.pixels = context.function2Id(function () { imagePixels.pixels = context.function2Id(function () {
@ -2338,8 +2335,7 @@ var Image = /** @class */ (function (_super) {
} }
return ret; return ret;
}; };
__decorate$a([ __decorate$b([
>>>>>>> 60c3fff0... iOS: implement Image Pixel
Property, Property,
__metadata$b("design:type", Object) __metadata$b("design:type", Object)
], Image.prototype, "imagePixels", void 0); ], Image.prototype, "imagePixels", void 0);

4
doric-web/dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long