Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
xfgryujk committed Jul 25, 2018
2 parents 73734e3 + 17d44f3 commit 8083e72
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "weibo-img-crypto",
"version": "1.3.1",
"version": "1.3.2",
"description": "Automatically encrypt images before uploading them to Weibo.",
"author": "xfgryujk <xfgryujk@126.com>",
"private": true,
Expand Down
2 changes: 1 addition & 1 deletion src/gui/gui.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</a>
</el-tooltip>

<el-dialog title="weibo-img-crypto v1.3.1" :visible.sync="dialogVisible">
<el-dialog title="weibo-img-crypto v1.3.2" :visible.sync="dialogVisible">
<el-tabs>
<el-tab-pane label="基础">
<el-form label-width="100px">
Expand Down
2 changes: 1 addition & 1 deletion src/imgproc.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function copy24BitsTo32Bits (dstData, srcData, width, height) {
for (let y = 1; y < height - 1; y++) {
let iDst = (y * width + 1) * 4
let iSrc = (y * width + 1) * 3
for (let x = 0; x < width - 1; x++, iDst += 4, iSrc += 3) {
for (let x = 1; x < width - 1; x++, iDst += 4, iSrc += 3) {
dstData[iDst] = srcData[iSrc]
dstData[iDst + 1] = srcData[iSrc + 1]
dstData[iDst + 2] = srcData[iSrc + 2]
Expand Down
2 changes: 1 addition & 1 deletion weibo-img-crypto.js

Large diffs are not rendered by default.

0 comments on commit 8083e72

Please sign in to comment.