pcmockup: fix logical merge conflict

Helco · Dec 7, 2018 · 341a266 · 341a266
1 parent 6d29056
commit 341a266
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/pcmockup/pcmockup.h b/pcmockup/pcmockup.h
@@ -35,7 +35,8 @@ void safeFramebuffer_check(SafeFramebuffer* me);
 typedef struct PebbleWindow PebbleWindow;
 PebbleWindow* pebbleWindow_init(WindowContainer* parent, SDL_Rect initialBounds, GSize pebbleSize);
 void pebbleWindow_free(PebbleWindow* window);
-void pebbleWindow_update(PebbleWindow* me);
+void pebbleWindow_startUpdate(PebbleWindow* me);
+void pebbleWindow_endUpdate(PebbleWindow* me);
 GColor* pebbleWindow_getPebbleFramebuffer(PebbleWindow* window);
 ImageWindow* pebbleWindow_asImageWindow(PebbleWindow* window);
 

diff --git a/pcmockup/pebblewindow.c b/pcmockup/pebblewindow.c
@@ -84,9 +84,7 @@ static inline SDL_Color prv_convertGColorTo32Bit(GColor pebbleColor)
 static void prv_pebbleWindow_convertPebbleToTexture(PebbleWindow* me)
 {
     const GColor* pebblePixels = pebbleWindow_getPebbleFramebuffer(me);
-    char* texPixels;
-    int texPitch;
-    SDL_LockTexture(me->pebbleTexture, NULL, (void**)&texPixels, &texPitch);
+    SDL_Color* texPixels = me->textureData;
 
     uint32_t* itTexPixel;
     const GColor* itPebblePixel;