Skip to content

Commit

Permalink
Merge pull request #19 from Nigh/exif-fix2
Browse files Browse the repository at this point in the history
修复v0.2.1版本读取不含Exif文件报错的问题
  • Loading branch information
Nigh authored Sep 11, 2023
2 parents deef5ad + 5ecc511 commit 4f753ba
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 12 deletions.
22 changes: 11 additions & 11 deletions app.ahk
Original file line number Diff line number Diff line change
Expand Up @@ -260,18 +260,18 @@ mygui_DropFiles(GuiObj, GuiCtrlObj, FileArray, X, Y) {
Loop Files, fullpath, "F" {
picture_array[2] := picture_array[1]
exinfo := Filexpro(A_LoopFileFullPath, "", "System.Photo.Orientation", "System.Photo.FNumber", "System.Photo.ISOSpeed", "System.Photo.FocalLength", "System.Photo.ExposureTime", "System.Photo.ExposureTimeNumerator", "System.Photo.ExposureTimeDenominator", "xInfo")
list_exinfo := ""
for k, v in exinfo {
list_exinfo .= "[" k "]=" v "`n"
if (StrLen(exinfo["System.Photo.FocalLength"]) > 0) {
ex_focal := exinfo["System.Photo.FocalLength"] "mm"
ex_apture := "F" exinfo["System.Photo.FNumber"]
ex_ISO := "ISO" exinfo["System.Photo.ISOSpeed"]
ex_exposure := ("0" exinfo["System.Photo.ExposureTime"]) + 0
if (ex_exposure < 1) {
ex_exposure := exinfo["System.Photo.ExposureTimeNumerator"] "/" exinfo["System.Photo.ExposureTimeDenominator"] "s"
}
exif := ex_focal " " ex_apture " " ex_exposure " " ex_ISO
} else {
exif := "NULL"
}
ex_focal := exinfo["System.Photo.FocalLength"] "mm"
ex_apture := "F" exinfo["System.Photo.FNumber"]
ex_ISO := "ISO" exinfo["System.Photo.ISOSpeed"]
ex_exposure := exinfo["System.Photo.ExposureTime"] + 0
if (ex_exposure < 1) {
ex_exposure := exinfo["System.Photo.ExposureTimeNumerator"] "/" exinfo["System.Photo.ExposureTimeDenominator"] "s"
}
exif := ex_focal " " ex_apture " " ex_exposure " " ex_ISO
if (exinfo["System.Photo.Orientation"] == "8") {
Gdip_ImageRotateFlip(bitmap, 3)
}
Expand Down
3 changes: 2 additions & 1 deletion meta.ahk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FileEncoding("UTF-8")
appName := "PicQuickCompare"
version := "0.2.1"
version := "0.2.2"
versionFilename := "version.txt"
ahkFilename := "app.ahk"
binaryFilename := "PicQuickCompare.exe"
Expand All @@ -11,4 +11,5 @@ update_log := "
1. 增加Exif信息显示
2. 根据Exif信息自动旋转图片
3. 修复v0.2.0版本Exif只能获取英文系统的问题
3. 修复v0.2.1版本读取不含Exif文件报错的问题
)"

0 comments on commit 4f753ba

Please sign in to comment.