[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58964] trunk/blender/source/blender/ compositor/operations: code cleanup: remove lock from ViewerOperation class

[Campbell Barton]

Revision: 58964
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58964
Author:   campbellbarton
Date:     2013-08-06 09:27:20 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
code cleanup: remove lock from ViewerOperation class

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.cpp
    trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.h

Modified: trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.cpp	2013-08-06 09:19:44 UTC (rev 58963)
+++ trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.cpp	2013-08-06 09:27:20 UTC (rev 58964)
@@ -130,8 +130,9 @@
 
 void ViewerOperation::initImage()
 {
-	Image *anImage = this->m_image;
-	ImBuf *ibuf = BKE_image_acquire_ibuf(anImage, this->m_imageUser, &this->m_lock);
+	Image *ima = this->m_image;
+	void *lock;
+	ImBuf *ibuf = BKE_image_acquire_ibuf(ima, this->m_imageUser, &lock);
 
 	if (!ibuf) return;
 	BLI_lock_thread(LOCK_DRAW_IMAGE);
@@ -143,7 +144,7 @@
 		ibuf->x = getWidth();
 		ibuf->y = getHeight();
 		imb_addrectfloatImBuf(ibuf);
-		anImage->ok = IMA_OK_LOADED;
+		ima->ok = IMA_OK_LOADED;
 
 		ibuf->userflags |= IB_DISPLAY_BUFFER_INVALID;
 
@@ -165,7 +166,7 @@
 		this->m_depthBuffer = ibuf->zbuf_float;
 	}
 
-	BKE_image_release_ibuf(this->m_image, this->m_ibuf, this->m_lock);
+	BKE_image_release_ibuf(this->m_image, this->m_ibuf, lock);
 }
 
 void ViewerOperation::updateImage(rcti *rect)

Modified: trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.h
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.h	2013-08-06 09:19:44 UTC (rev 58963)
+++ trunk/blender/source/blender/compositor/operations/COM_ViewerOperation.h	2013-08-06 09:27:20 UTC (rev 58964)
@@ -33,7 +33,6 @@
 	float *m_depthBuffer;
 	Image *m_image;
 	ImageUser *m_imageUser;
-	void *m_lock;
 	bool m_active;
 	float m_centerX;
 	float m_centerY;