From 4b366754716fc4b5d0148de03ee8d9710df1bfdb Mon Sep 17 00:00:00 2001
From: Joseph Redmon <pjreddie@gmail.com>
Date: Sun, 12 Jul 2015 05:53:45 +0000
Subject: [PATCH] Merge branch 'master' of github.com:pjreddie/darknet

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

diff --git a/src/convolutional_layer.h b/src/convolutional_layer.h
index 334759c..3954f8a 100644
--- a/src/convolutional_layer.h
+++ b/src/convolutional_layer.h
@@ -22,7 +22,7 @@
 #endif
 
 convolutional_layer make_convolutional_layer(int batch, int h, int w, int c, int n, int size, int stride, int pad, ACTIVATION activation);
-void resize_convolutional_layer(convolutional_layer *layer, int h, int w);
+void resize_convolutional_layer(convolutional_layer *layer, int w, int h);
 void forward_convolutional_layer(const convolutional_layer layer, network_state state);
 void update_convolutional_layer(convolutional_layer layer, int batch, float learning_rate, float momentum, float decay);
 image *visualize_convolutional_layer(convolutional_layer layer, char *window, image *prev_filters);

--
Gitblit v1.10.0