Specify CPL standard on construction.

[libdcp.git] / tools / common.cc

diff --git a/tools/common.cc b/tools/common.cc
index aaa07fb2c6868fd46a66462c106c751c0091fa43..54bee6b5c9a1f217983c9c8ac8b665680f2ec15a 100644 (file)
--- a/tools/common.cc
+++ b/tools/common.cc
@@ -15,28 +15,40 @@
 
     You should have received a copy of the GNU General Public License
     along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "common.h"
 #include "dcp.h"
 
-using std::list;
-using boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
+using std::shared_ptr;
+using std::vector;
 
 void
-dcp::filter_errors (dcp::DCP::ReadErrors& errors, bool ignore_missing_assets)
+dcp::filter_notes (vector<dcp::VerificationNote>& notes, bool ignore_missing_assets)
 {
-       for (DCP::ReadErrors::iterator i = errors.begin(); i != errors.end(); ) {
-
-               DCP::ReadErrors::iterator tmp = i;
-               ++tmp;
+       if (!ignore_missing_assets) {
+               return;
+       }
 
-               if (ignore_missing_assets && dynamic_pointer_cast<MissingAssetError> (*i)) {
-                       errors.erase (i);
-               }
+       vector<dcp::VerificationNote> filtered;
+       std::copy_if (notes.begin(), notes.end(), std::back_inserter(filtered), [](dcp::VerificationNote const& i) {
+               return i.code() != dcp::VerificationNote::Code::MISSING_ASSET && i.code() != dcp::VerificationNote::Code::EXTERNAL_ASSET;
+       });
 
-               i = tmp;
-       }
+       notes = filtered;
 }
-