Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00: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
Show Stats 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 height *= 8
buffered = io.BytesIO() buffered = io.BytesIO()
image.save(buffered, format="PNG") image.save(buffered, format="PNG")
<<<<<<< HEAD
img_base64 = "data:image/jpeg;base64," + base64.b64encode(buffered.getvalue()).decode('UTF-8') 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( self.socketio.emit(
"intermediateResult", "intermediateResult",
{ {

4
frontend/src/features/gallery/CurrentImageButtons.tsx
View File

@ -61,7 +61,11 @@ const systemSelector = createSelector(
const { upscalingLevel, facetoolStrength, shouldShowImageDetails } = const { upscalingLevel, facetoolStrength, shouldShowImageDetails } =
options; options;
<<<<<<< HEAD
const { intermediateImage, currentImage } = gallery; const { intermediateImage, currentImage } = gallery;
=======
const { intermediateImage } = gallery;
>>>>>>> 4013e8a... Fixes b64 image sending and displaying
return { return {
isProcessing, isProcessing,