Skip to content

Commit ed10383

Browse files
committed
dnn: added trace macros
1 parent bbb14d3 commit ed10383

36 files changed

+224
-24
lines changed

modules/dnn/src/caffe/caffe_importer.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
using namespace cv;
4444
using namespace cv::dnn;
4545

46-
#if HAVE_PROTOBUF
46+
#ifdef HAVE_PROTOBUF
4747
#include "caffe.pb.h"
4848

4949
#include <iostream>
@@ -82,6 +82,8 @@ class CaffeImporter : public Importer
8282

8383
CaffeImporter(const char *pototxt, const char *caffeModel)
8484
{
85+
CV_TRACE_FUNCTION();
86+
8587
ReadNetParamsFromTextFileOrDie(pototxt, &net);
8688

8789
if (caffeModel && caffeModel[0])
@@ -264,6 +266,8 @@ class CaffeImporter : public Importer
264266

265267
void populateNet(Net dstNet)
266268
{
269+
CV_TRACE_FUNCTION();
270+
267271
int layersSize = net.layer_size();
268272
layerCounter.clear();
269273
addedBlobs.clear();

modules/dnn/src/caffe/caffe_io.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
//
8888
//M*/
8989

90-
#if HAVE_PROTOBUF
90+
#ifdef HAVE_PROTOBUF
9191
#include <google/protobuf/io/coded_stream.h>
9292
#include <google/protobuf/io/zero_copy_stream_impl.h>
9393
#include <google/protobuf/text_format.h>

modules/dnn/src/caffe/caffe_io.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989

9090
#ifndef __OPENCV_DNN_CAFFE_IO_HPP__
9191
#define __OPENCV_DNN_CAFFE_IO_HPP__
92-
#if HAVE_PROTOBUF
92+
#ifdef HAVE_PROTOBUF
9393

9494
#include "caffe.pb.h"
9595

0 commit comments

Comments
 (0)