[[ ThreadedRendering ]] Fixed issues with image locking.

livecodemichael · livecodemichael · commit 7383aa4f4a53 · 2014-07-28T13:15:46.000+01:00
diff --git a/engine/src/image_rep.cpp b/engine/src/image_rep.cpp
@@ -239,13 +239,16 @@ bool MCLoadableImageRep::LockImageFrame(uindex_t p_frame, MCGFloat p_density, MC
 	if (m_frame_count != 0 && p_frame >= m_frame_count)
 		return false;
 	
+    MCThreadMutexLock(m_frame_lock);
+    
+	if (m_frame_count != 0 && p_frame >= m_frame_count)
+		return false;
+    
 	if (!EnsureMCGImageFrames())
 		return false;
 	
 	if (p_frame >= m_frame_count)
 		return false;
-	
-    MCThreadMutexLock(m_frame_lock);
     
 	// prevent data being removed by cache flush
 	m_lock_count++;
diff --git a/engine/src/stacktile.cpp b/engine/src/stacktile.cpp
@@ -132,7 +132,6 @@ void MCStackTileCollectAll(void)
             t_tile -> tile -> Unlock();
             t_tile -> tile = NULL;
             MCLog("TILE %d COLLECTED", t_tile -> index);
-
             
             // Move the tile to the inactive list.
             t_tile -> next = s_inactive_tiles;
diff --git a/libgraphics/src/image.cpp b/libgraphics/src/image.cpp
@@ -24,7 +24,10 @@ static void MCGImageDestroy(MCGImageRef self)
 	if (self != NULL)
 	{
 		if (self -> bitmap != NULL)
+        {
+            self -> bitmap -> unlockPixels();
 			delete self -> bitmap;
+        }
 		MCMemoryDelete(self);
 	}
 }
@@ -44,6 +47,7 @@ bool MCGImageCreateWithSkBitmap(const SkBitmap &p_bitmap, MCGImageRef &r_image)
 	if (t_success)
 	{
 		t_bitmap = new SkBitmap(p_bitmap);
+        t_bitmap -> lockPixels();
 		t_success = nil != t_bitmap;
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,10 @@ static void MCGImageDestroy(MCGImageRef self)`
`24`	`24`	`if (self != NULL)`
`25`	`25`	`{`
`26`	`26`	`if (self -> bitmap != NULL)`
	`27`	`+ {`
	`28`	`+ self -> bitmap -> unlockPixels();`
`27`	`29`	`delete self -> bitmap;`
	`30`	`+ }`
`28`	`31`	`MCMemoryDelete(self);`
`29`	`32`	`}`
`30`	`33`	`}`
`@@ -44,6 +47,7 @@ bool MCGImageCreateWithSkBitmap(const SkBitmap &p_bitmap, MCGImageRef &r_image)`
`44`	`47`	`if (t_success)`
`45`	`48`	`{`
`46`	`49`	`t_bitmap = new SkBitmap(p_bitmap);`
	`50`	`+ t_bitmap -> lockPixels();`
`47`	`51`	`t_success = nil != t_bitmap;`
`48`	`52`	`}`
`49`	`53`