lmh188
/
code_app
mirror of http://192.168.10.5:8099/sane/code_app.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.10.5:8099/sane/code_app into dev

This commit is contained in:
luoliangyi 2023-06-13 10:25:19 +08:00
parent 6e661e7848 ce7d346b20
commit cd123eeba4
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/scanner2/Scanner_zh_CN.qm
View File

Binary file not shown.

4
app/scanner2/Scanner_zh_CN.ts
View File

@ -1393,7 +1393,7 @@ Continue to clear?</source>
<message> <message>
<location filename="dialog_multirotate.ui" line="40"/> <location filename="dialog_multirotate.ui" line="40"/>
<source>90°</source> <source>90°</source>
<translation>旋转90°</translation> <translation>向右旋转90°</translation>
</message> </message>
<message> <message>
<location filename="dialog_multirotate.ui" line="50"/> <location filename="dialog_multirotate.ui" line="50"/>
@ -1403,7 +1403,7 @@ Continue to clear?</source>
<message> <message>
<location filename="dialog_multirotate.ui" line="57"/> <location filename="dialog_multirotate.ui" line="57"/>
<source>-90°</source> <source>-90°</source>
<translation>旋转-90°</translation> <translation>向左旋转90°</translation>
</message> </message>
<message> <message>
<location filename="dialog_multirotate.ui" line="67"/> <location filename="dialog_multirotate.ui" line="67"/>

BIN
app/scanner2/Scanner_zh_EN.qm
View File

Binary file not shown.

4
app/scanner2/Scanner_zh_EN.ts
View File

@ -1334,7 +1334,7 @@ Continue clearing?</translation>
<message> <message>
<location filename="dialog_multirotate.ui" line="40"/> <location filename="dialog_multirotate.ui" line="40"/>
<source>90°</source> <source>90°</source>
<translation>Rotate 90°</translation> <translation>Rotate 90° to the right</translation>
</message> </message>
<message> <message>
<location filename="dialog_multirotate.ui" line="50"/> <location filename="dialog_multirotate.ui" line="50"/>
@ -1344,7 +1344,7 @@ Continue clearing?</translation>
<message> <message>
<location filename="dialog_multirotate.ui" line="57"/> <location filename="dialog_multirotate.ui" line="57"/>
<source>-90°</source> <source>-90°</source>
<translation>Rotate -90°</translation> <translation>Rotate 90° to the left</translation>
</message> </message>
<message> <message>
<location filename="dialog_multirotate.ui" line="67"/> <location filename="dialog_multirotate.ui" line="67"/>

6
app/scanner2/dialog_multirotateimagefile.cpp
View File

@ -1,4 +1,4 @@
#include "dialog_multirotateimagefile.h" #include "dialog_multirotateimagefile.h"
#include "ui_dialog_multirotateimagefile.h" #include "ui_dialog_multirotateimagefile.h"
#include "imgfmt/HGImgFmt.h" #include "imgfmt/HGImgFmt.h"
#include "HGUIGlobal.h" #include "HGUIGlobal.h"
@ -77,7 +77,7 @@ void HGAPI Dialog_MultiRotateImageFile::ThreadFunc(HGThread thread, HGPointer pa
HGBase_GetImageDpi(img, &xDpi, &yDpi); HGBase_GetImageDpi(img, &xDpi, &yDpi);
HGBase_SetImageDpi(img2, xDpi, yDpi); HGBase_SetImageDpi(img2, xDpi, yDpi);
HGBase_ImageRotateLeft(img, img2); HGBase_ImageRotateRight(img, img2);
HGBase_DestroyImage(img); HGBase_DestroyImage(img);
img = img2; img = img2;
} }
@ -94,7 +94,7 @@ void HGAPI Dialog_MultiRotateImageFile::ThreadFunc(HGThread thread, HGPointer pa
HGBase_GetImageDpi(img, &xDpi, &yDpi); HGBase_GetImageDpi(img, &xDpi, &yDpi);
HGBase_SetImageDpi(img2, xDpi, yDpi); HGBase_SetImageDpi(img2, xDpi, yDpi);
HGBase_ImageRotateRight(img, img2); HGBase_ImageRotateLeft(img, img2);
HGBase_DestroyImage(img); HGBase_DestroyImage(img);
img = img2; img = img2;
} }