summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--camlibs/stv0680/Makefile-files2
-rw-r--r--camlibs/stv0680/library.c2
-rw-r--r--camlibs/stv0680/stv0680-bayer.c (renamed from camlibs/stv0680/bayer.c)2
-rw-r--r--camlibs/stv0680/stv0680-bayer.h (renamed from camlibs/stv0680/bayer.h)0
4 files changed, 3 insertions, 3 deletions
diff --git a/camlibs/stv0680/Makefile-files b/camlibs/stv0680/Makefile-files
index bd0cba047..0c5a122ee 100644
--- a/camlibs/stv0680/Makefile-files
+++ b/camlibs/stv0680/Makefile-files
@@ -10,7 +10,7 @@ EXTRA_LTLIBRARIES += stv0680.la
stv0680_la_SOURCES = \
stv0680/stv0680.c stv0680/stv0680.h \
stv0680/library.c stv0680/library.h \
- stv0680/bayer.c stv0680/bayer.h \
+ stv0680/stv0680-bayer.c stv0680/stv0680-bayer.h \
stv0680/sharpen.c stv0680/sharpen.h \
stv0680/saturate.c stv0680/saturate.h \
stv0680/demosaic_sharpen.h stv0680/demosaic_sharpen.c
diff --git a/camlibs/stv0680/library.c b/camlibs/stv0680/library.c
index 00abfc20e..3d2699773 100644
--- a/camlibs/stv0680/library.c
+++ b/camlibs/stv0680/library.c
@@ -30,7 +30,7 @@
#include "stv0680.h"
#include "library.h"
#include "sharpen.h"
-#include "bayer.h"
+#include "stv0680-bayer.h"
#include "saturate.h"
#include "libgphoto2/bayer.h"
#include "demosaic_sharpen.h"
diff --git a/camlibs/stv0680/bayer.c b/camlibs/stv0680/stv0680-bayer.c
index 249b22c1d..fed5322c3 100644
--- a/camlibs/stv0680/bayer.c
+++ b/camlibs/stv0680/stv0680-bayer.c
@@ -22,7 +22,7 @@
#include <math.h>
#include <stdlib.h>
-#include "bayer.h"
+#include "stv0680-bayer.h"
/* Enhanced by Kurt Garloff to do scaling and debayering at the same time. */
void bayer_unshuffle_preview(unsigned int w, unsigned int h, unsigned int scale, unsigned char *raw, unsigned char *output)
diff --git a/camlibs/stv0680/bayer.h b/camlibs/stv0680/stv0680-bayer.h
index 8265281c1..8265281c1 100644
--- a/camlibs/stv0680/bayer.h
+++ b/camlibs/stv0680/stv0680-bayer.h