From b8eb8b0a4016232c8da95c26501ac60ea9491901 Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Fri, 02 Sep 2016 00:26:12 +0000
Subject: [PATCH] Merge branch 'master' of github.com:pjreddie/darknet

---
 src/detection_layer.h |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/detection_layer.h b/src/detection_layer.h
index dfc5db9..e8c3a72 100644
--- a/src/detection_layer.h
+++ b/src/detection_layer.h
@@ -1,16 +1,14 @@
 #ifndef DETECTION_LAYER_H
 #define DETECTION_LAYER_H
 
-#include "params.h"
 #include "layer.h"
+#include "network.h"
 
 typedef layer detection_layer;
 
-detection_layer make_detection_layer(int batch, int inputs, int classes, int coords, int rescore, int background, int nuisance);
+detection_layer make_detection_layer(int batch, int inputs, int n, int size, int classes, int coords, int rescore);
 void forward_detection_layer(const detection_layer l, network_state state);
 void backward_detection_layer(const detection_layer l, network_state state);
-int get_detection_layer_output_size(detection_layer l);
-int get_detection_layer_locations(detection_layer l);
 
 #ifdef GPU
 void forward_detection_layer_gpu(const detection_layer l, network_state state);

--
Gitblit v1.10.0