* Revert to v1.5.0

CaroloCup-CameraPlayback.cpp

@@ -33,15 +33,15 @@
 #include <core/wrapper/SharedMemoryFactory.h>
 #include <tools/player/Player.h>
 
-#include <GeneratedHeaders_CoreData.h>
+#include <core/data/image/SharedImage.h>
 
 using namespace std;
 
 // We add some of OpenDaVINCI's namespaces for the sake of readability.
 using namespace core;
 using namespace core::base;
 using namespace core::data;
-using namespace coredata::image;
+using namespace core::data::image;
 using namespace core::io;
 using namespace core::wrapper;
 using namespace tools::player;
@@ -115,7 +115,7 @@ int32_t main(int32_t argc, char **argv) {
                 // Check if we could successfully attach to the shared memory.
                 if (sharedImageMemory->isValid()) {
                     // Using a shared lock to get exclusive access.
-                    Lock l(sharedImageMemory);
+                    sharedImageMemory->lock();
 
                     if (image == NULL) {
                         // Create the IplImage header data and access the shared memory for the actual image data. 
@@ -125,6 +125,8 @@ int32_t main(int32_t argc, char **argv) {
                         image->imageData = static_cast<char*>(sharedImageMemory->getSharedMemory());
                     }
 
+                    sharedImageMemory->unlock();
+
                     // Show the image using OpenCV.
                     cvShowImage("CaroloCup-CameraPlayback", image);