Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
b6b9faa7
Commit
b6b9faa7
authored
Sep 13, 2022
by
AUTOMATIC
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add support for reading saved jpeg comments
parent
eeabe62b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
8 deletions
+24
-8
modules/extras.py
modules/extras.py
+15
-1
modules/images.py
modules/images.py
+9
-7
No files found.
modules/extras.py
View file @
b6b9faa7
...
@@ -6,6 +6,8 @@ from modules.shared import opts
...
@@ -6,6 +6,8 @@ from modules.shared import opts
import
modules.gfpgan_model
import
modules.gfpgan_model
from
modules.ui
import
plaintext_to_html
from
modules.ui
import
plaintext_to_html
import
modules.codeformer_model
import
modules.codeformer_model
import
piexif
cached_images
=
{}
cached_images
=
{}
...
@@ -73,8 +75,20 @@ def run_extras(image, gfpgan_visibility, codeformer_visibility, codeformer_weigh
...
@@ -73,8 +75,20 @@ def run_extras(image, gfpgan_visibility, codeformer_visibility, codeformer_weigh
def
run_pnginfo
(
image
):
def
run_pnginfo
(
image
):
items
=
image
.
info
if
"exif"
in
image
.
info
:
exif
=
piexif
.
load
(
image
.
info
[
"exif"
])
exif_comment
=
(
exif
or
{})
.
get
(
"Exif"
,
{})
.
get
(
piexif
.
ExifIFD
.
UserComment
,
b
''
)
exif_comment
=
exif_comment
.
decode
(
"utf8"
,
'ignore'
)
items
[
'exif comment'
]
=
exif_comment
for
field
in
[
'jfif'
,
'jfif_version'
,
'jfif_unit'
,
'jfif_density'
,
'dpi'
,
'exif'
]:
del
items
[
field
]
info
=
''
info
=
''
for
key
,
text
in
i
mage
.
info
.
items
():
for
key
,
text
in
i
tems
.
items
():
info
+=
f
"""
info
+=
f
"""
<div>
<div>
<p><b>{plaintext_to_html(str(key))}</b></p>
<p><b>{plaintext_to_html(str(key))}</b></p>
...
...
modules/images.py
View file @
b6b9faa7
...
@@ -325,14 +325,16 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
...
@@ -325,14 +325,16 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
if
not
os
.
path
.
exists
(
fullfn
):
if
not
os
.
path
.
exists
(
fullfn
):
break
break
if
extension
==
"png"
:
if
extension
.
lower
()
in
(
"jpg"
,
"jpeg"
):
image
.
save
(
fullfn
,
quality
=
opts
.
jpeg_quality
,
pnginfo
=
pnginfo
)
exif_bytes
=
piexif
.
dump
({
"Exif"
:
{
piexif
.
ExifIFD
.
UserComment
:
info
.
encode
(
"utf8"
),
}
})
else
:
else
:
exif_dict
=
{
"Exif"
:
dict
()
}
exif_bytes
=
None
exif_dict
[
"Exif"
][
piexif
.
ExifIFD
.
UserComment
]
=
piexif
.
helper
.
UserComment
.
dump
(
info
,
encoding
=
"unicode"
)
image
.
save
(
fullfn
,
quality
=
opts
.
jpeg_quality
,
pnginfo
=
pnginfo
,
exif
=
exif_bytes
)
exif_bytes
=
piexif
.
dump
(
exif_dict
)
image
.
save
(
fullfn
,
quality
=
opts
.
jpeg_quality
,
exif
=
exif_bytes
)
target_side_length
=
4000
target_side_length
=
4000
oversize
=
image
.
width
>
target_side_length
or
image
.
height
>
target_side_length
oversize
=
image
.
width
>
target_side_length
or
image
.
height
>
target_side_length
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment