From f0abcfa02b2094396f955c743f7f11fcdb2e3d13 Mon Sep 17 00:00:00 2001
From: IlyaOvodov <b@ovdv.ru>
Date: Mon, 04 Jun 2018 15:57:15 +0000
Subject: [PATCH] Merge branch 'master' of https://github.com/AlexeyAB/darknet into Fix_get_color_depth
---
src/image.h | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/image.h b/src/image.h
index 7145997..d047f62 100644
--- a/src/image.h
+++ b/src/image.h
@@ -9,8 +9,8 @@
#include "box.h"
typedef struct {
- int h;
- int w;
+ int w;
+ int h;
int c;
float *data;
} image;
@@ -23,7 +23,7 @@
void draw_label(image a, int r, int c, image label, const float *rgb);
void write_label(image a, int r, int c, image *characters, char *string, float *rgb);
void draw_detections(image im, int num, float thresh, box *boxes, float **probs, char **names, image **labels, int classes);
-void draw_detections_v3(image im, detection *dets, int num, float thresh, char **names, image **alphabet, int classes);
+void draw_detections_v3(image im, detection *dets, int num, float thresh, char **names, image **alphabet, int classes, int ext_output);
image image_distance(image a, image b);
void scale_image(image m, float s);
image crop_image(image im, int dx, int dy, int w, int h);
@@ -77,10 +77,10 @@
YOLODLL_API image load_image_color(char *filename, int w, int h);
image **load_alphabet();
-float get_pixel(image m, int x, int y, int c);
-float get_pixel_extend(image m, int x, int y, int c);
-void set_pixel(image m, int x, int y, int c, float val);
-void add_pixel(image m, int x, int y, int c, float val);
+//float get_pixel(image m, int x, int y, int c);
+//float get_pixel_extend(image m, int x, int y, int c);
+//void set_pixel(image m, int x, int y, int c, float val);
+//void add_pixel(image m, int x, int y, int c, float val);
float bilinear_interpolate(image im, float x, float y, int c);
image get_image_layer(image m, int l);
--
Gitblit v1.10.0