github/InvokeAI
1
1
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI.git synced 2026-04-23 03:00:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
psychedelicious
2022-11-01 21:54:35 +11:00
committed by Lincoln Stein
parent 5502b29340
commit 9b984e0d1e
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backend/invoke_ai_web_server.py
View File

@@ -654,7 +654,12 @@ class InvokeAIWebServer:
height *= 8
buffered = io.BytesIO()
image.save(buffered, format="PNG")
<<<<<<< HEAD
img_base64 = "data:image/jpeg;base64," + base64.b64encode(buffered.getvalue()).decode('UTF-8')
=======
img_str = base64.b64encode(buffered.getvalue()).decode('UTF-8')
img_base64 = "data:image/jpeg;base64," + img_str
>>>>>>> 4013e8a... Fixes b64 image sending and displaying
self.socketio.emit(
"intermediateResult",
{