comparison Framework/Scene2D/Scene2D.cpp @ 646:b4fe9642e83b

Merge from default
author Benjamin Golinvaux <bgo@osimis.io>
date Mon, 13 May 2019 15:22:08 +0200
parents f939f449482c
children 462a5074f914
comparison
equal deleted inserted replaced
645:1e9ed656318e 646:b4fe9642e83b
100 100
101 101
102 void Scene2D::SetLayer(int depth, 102 void Scene2D::SetLayer(int depth,
103 ISceneLayer* layer) // Takes ownership 103 ISceneLayer* layer) // Takes ownership
104 { 104 {
105 //LOG(INFO) << "SetLayer(" << depth << ", " << 105 LOG(INFO) << "SetLayer(" << depth << ", " <<
106 // reinterpret_cast<intptr_t>(layer) << ")"; 106 reinterpret_cast<intptr_t>(layer) << ")";
107 std::auto_ptr<Item> item(new Item(layer, layerCounter_++)); 107 std::auto_ptr<Item> item(new Item(layer, layerCounter_++));
108 108
109 if (layer == NULL) 109 if (layer == NULL)
110 { 110 {
111 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); 111 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer);