dyne · jaromil · Jul 22, 2024 · May 3, 2024 · May 5, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,8 +35,7 @@ set (FREI0R_1_1_DEF "${CMAKE_SOURCE_DIR}/msvc/frei0r_1_1.def")
 # --- custom targets: ---
 INCLUDE( cmake/modules/TargetDistclean.cmake OPTIONAL)
 
-# See this thread for a ridiculous discussion about the simple question how to install a header file with CMake: http://www.cmake.org/pipermail/cmake/2009-October/032874.html
-install (DIRECTORY include DESTINATION . FILES_MATCHING PATTERN "frei0r.h" PATTERN "msvc" EXCLUDE)
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 # For code documentation run: doxygen doc/Doxyfile
 # add_subdirectory (doc)

diff --git a/include/blur.h → include/frei0r/blur.h b/include/blur.h → include/frei0r/blur.h
diff --git a/include/frei0r_cairo.h → include/frei0r/cairo.h b/include/frei0r_cairo.h → include/frei0r/cairo.h
@@ -1,5 +1,5 @@
 /*
- * frei0r_cairo.h
+ * frei0r/cairo.h
  * Copyright 2012 Janne Liljeblad 
  *
  * This file is part of Frei0r.
@@ -22,7 +22,7 @@
 
 #include <cairo.h>
 #include <string.h>
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 /**
 * String identifiers for gradient types available using Cairo.

diff --git a/include/frei0r_cfc.h → include/frei0r/cfc.h b/include/frei0r_cfc.h → include/frei0r/cfc.h
diff --git a/include/frei0r_colorspace.h → include/frei0r/colorspace.h b/include/frei0r_colorspace.h → include/frei0r/colorspace.h
@@ -1,4 +1,4 @@
-/* frei0r_colorspace.h
+/* frei0r/colorspace.h
  * Copyright (C) 2004 Mathieu Guindon, Julien Keable, Jean-Sebastien Senecal
  * This file is part of Frei0r.
  *
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FREI0R_COLORSPACE_H
 #define INCLUDED_FREI0R_COLORSPACE_H
 
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 #include <stdlib.h>
 #include <math.h>
 

diff --git a/include/frei0r_math.h → include/frei0r/math.h b/include/frei0r_math.h → include/frei0r/math.h
diff --git a/src/filter/aech0r/aech0r.cpp b/src/filter/aech0r/aech0r.cpp
@@ -22,7 +22,7 @@
  *
  */
 #include "frei0r.hpp"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 #include <string.h>
 #include <climits>

diff --git a/src/filter/alpha0ps/alpha0ps_alphaspot.c b/src/filter/alpha0ps/alpha0ps_alphaspot.c
@@ -29,7 +29,7 @@ Copyright (C) 2010  Marko Cebokli    http://lea.hamradio.si/~s57uuu
 
 //#include <stdio.h>
 #include <frei0r.h>
-#include <frei0r_math.h>
+#include <frei0r/math.h>
 #include <stdlib.h>
 #include <math.h>
 #include <assert.h>

diff --git a/src/filter/balanc0r/balanc0r.c b/src/filter/balanc0r/balanc0r.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 static const float bbWB[][3] = 
 {

diff --git a/src/filter/blur/fibe.h b/src/filter/blur/fibe.h
@@ -69,7 +69,7 @@ and therefore time consuming "walks" through memory.
 
 #include <sys/types.h>
 #include <string.h>
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 //---------------------------------------------------------
 //koeficienti za biquad lowpass  iz f in q

diff --git a/src/filter/brightness/brightness.c b/src/filter/brightness/brightness.c
@@ -21,7 +21,7 @@
 #include <assert.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 typedef struct brightness_instance
 {

diff --git a/src/filter/c0rners/c0rners.c b/src/filter/c0rners/c0rners.c
@@ -28,7 +28,7 @@
 #include <frei0r.h>
 #include <string.h>
 #include <math.h>
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 #include "interp.h"
 
 //----------------------------------------

diff --git a/src/filter/cairogradient/cairogradient.c b/src/filter/cairogradient/cairogradient.c
@@ -27,7 +27,7 @@
 #include <math.h>
 
 #include "frei0r.h"
-#include "frei0r_cairo.h"
+#include "frei0r/cairo.h"
 
 typedef struct cairo_gradient_instance
 {

diff --git a/src/filter/cairoimagegrid/cairoimagegrid.c b/src/filter/cairoimagegrid/cairoimagegrid.c
@@ -24,7 +24,7 @@
 #include <cairo.h>
 
 #include "frei0r.h"
-#include "frei0r_cairo.h"
+#include "frei0r/cairo.h"
 
 #define MAX_ROWS    20
 #define MAX_COLUMNS 20 

diff --git a/src/filter/cluster/cluster.c b/src/filter/cluster/cluster.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 #define MAXNUM 40
 

diff --git a/src/filter/colgate/colgate.c b/src/filter/colgate/colgate.c
@@ -88,7 +88,7 @@
 #endif
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 enum ParamIndex {
 	NEUTRAL_COLOR,

diff --git a/src/filter/colordistance/colordistance.c b/src/filter/colordistance/colordistance.c
@@ -23,7 +23,7 @@
 #include <stdio.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 typedef struct colordistance_instance
 {

diff --git a/src/filter/colorhalftone/colorhalftone.c b/src/filter/colorhalftone/colorhalftone.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <math.h>
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 double PI=3.14159265358979;
 

diff --git a/src/filter/colorize/colorize.c b/src/filter/colorize/colorize.c
@@ -32,7 +32,7 @@
 #include <assert.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 #define GIMP_RGB_LUMINANCE_RED    (0.2126)
 #define GIMP_RGB_LUMINANCE_GREEN  (0.7152)

diff --git a/src/filter/contrast0r/contrast0r.c b/src/filter/contrast0r/contrast0r.c
@@ -22,7 +22,7 @@
 #include <stdio.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 typedef struct contrast0r_instance
 {

diff --git a/src/filter/curves/curves.c b/src/filter/curves/curves.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 #define MAX3(a, b, c) ( ( a > b && a > c) ? a : (b > c ? b : c) )
 #define MIN3(a, b, c) ( ( a < b && a < c) ? a : (b < c ? b : c) )

diff --git a/src/filter/dither/dither.c b/src/filter/dither/dither.c
@@ -27,7 +27,7 @@
 #include <math.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 int ditherMagic2x2Matrix[] = {
 	 	 0, 2,

diff --git a/src/filter/edgeglow/edgeglow.cpp b/src/filter/edgeglow/edgeglow.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "frei0r.hpp"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 #include <stdlib.h>
 
 class edgeglow : public frei0r::filter

diff --git a/src/filter/emboss/emboss.c b/src/filter/emboss/emboss.c
@@ -27,7 +27,7 @@
 #include <math.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 double PI = 3.14159; 
 double pixelScale = 255.9;

diff --git a/src/filter/equaliz0r/equaliz0r.cpp b/src/filter/equaliz0r/equaliz0r.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "frei0r.hpp"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 #include <string.h>
 
 #include <cstring>

diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <opencv2/opencv.hpp>
 #include "frei0r.hpp"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 class TrackedObj {
 public:

diff --git a/src/filter/facedetect/facedetect.cpp b/src/filter/facedetect/facedetect.cpp
@@ -22,7 +22,7 @@
 #include <string.h>
 #include <opencv2/opencv.hpp>
 #include "frei0r.hpp"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 #define USE_ROI
 #define PAD (40)

diff --git a/src/filter/filmgrain/filmgrain.c b/src/filter/filmgrain/filmgrain.c
@@ -1,6 +1,6 @@
 #include <stdlib.h>
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 
 typedef struct flimgrain_instance

diff --git a/src/filter/gamma/gamma.c b/src/filter/gamma/gamma.c
@@ -22,7 +22,7 @@
 #include <assert.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 #define MAX_GAMMA 4.0
 

diff --git a/src/filter/gateweave/gateweave.c b/src/filter/gateweave/gateweave.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 
 // let's try to walk through everything because i'm a moron

diff --git a/src/filter/glitch0r/glitch0r.c b/src/filter/glitch0r/glitch0r.c
@@ -25,7 +25,7 @@
 #include <time.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 /* cheap & fast randomizer (by Fukuchi Kentarou) */
 static uint32_t randval;

diff --git a/src/filter/glow/glow.c b/src/filter/glow/glow.c
@@ -20,7 +20,7 @@
 #include <math.h>
 #include "frei0r.h"
 #include <stdlib.h>
-#include "blur.h"
+#include "frei0r/blur.h"
 
 typedef struct glow_instance {
 	double blur;

diff --git a/src/filter/hueshift0r/matrix.h b/src/filter/hueshift0r/matrix.h
@@ -7,7 +7,7 @@
  *
  *				Paul Haeberli - 1993
  */
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 #include <math.h>
 #include <stdio.h>
 

diff --git a/src/filter/lenscorrection/lenscorrection.c b/src/filter/lenscorrection/lenscorrection.c
@@ -22,7 +22,7 @@
 #include <assert.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 typedef struct lenscorrection_instance
 {

diff --git a/src/filter/levels/levels.c b/src/filter/levels/levels.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 enum ChannelChoice
 {

diff --git a/src/filter/luminance/luminance.c b/src/filter/luminance/luminance.c
@@ -22,7 +22,7 @@
 #include <assert.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 #define MAX_SATURATION 8.0
 

diff --git a/src/filter/mask0mate/mask0mate.c b/src/filter/mask0mate/mask0mate.c
@@ -20,7 +20,7 @@
 #include <math.h>
 #include "frei0r.h"
 #include <stdlib.h>
-#include "blur.h"
+#include "frei0r/blur.h"
 
 typedef struct mask0mate_instance {
 	double left, top, right, bottom;

diff --git a/src/filter/ndvi/ndvi.cpp b/src/filter/ndvi/ndvi.cpp
@@ -19,7 +19,7 @@
 #include <cairo.h>
 #endif
 #include "frei0r.hpp"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 #include "gradientlut.hpp"
 #include <string>
 #include <stdlib.h>

diff --git a/src/filter/normaliz0r/normaliz0r.c b/src/filter/normaliz0r/normaliz0r.c
@@ -74,7 +74,7 @@
 #include <stdio.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 #define MAX_HISTORY_LEN     128
 

diff --git a/src/filter/pixeliz0r/pixeliz0r.c b/src/filter/pixeliz0r/pixeliz0r.c
@@ -1,5 +1,5 @@
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>

diff --git a/src/filter/posterize/posterize.c b/src/filter/posterize/posterize.c
@@ -26,7 +26,7 @@
 #include <assert.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 typedef struct posterize_instance
 {

diff --git a/src/filter/premultiply/premultiply.cpp b/src/filter/premultiply/premultiply.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "frei0r.hpp"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 class Premultiply : public frei0r::filter
 {

diff --git a/src/filter/rgbnoise/rgbnoise.c b/src/filter/rgbnoise/rgbnoise.c
@@ -27,7 +27,7 @@
 #include <assert.h>
 #include <math.h>
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 static int MY_MAX_RAND = 32767;// I assume RAND_MAX to be at least this big.
 static double gaussian_lookup[32767];

diff --git a/src/filter/saturat0r/saturat0r.c b/src/filter/saturat0r/saturat0r.c
@@ -21,7 +21,7 @@
 #include <assert.h>
 
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 #define MAX_SATURATION 8.0
 

diff --git a/src/filter/sigmoidaltransfer/sigmoidaltransfer.c b/src/filter/sigmoidaltransfer/sigmoidaltransfer.c
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <math.h>
 #include "frei0r.h"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 
 #define SIGMOIDAL_BASE   2
 #define SIGMOIDAL_RANGE 20

diff --git a/src/filter/sobel/sobel.cpp b/src/filter/sobel/sobel.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "frei0r.hpp"
-#include "frei0r_math.h"
+#include "frei0r/math.h"
 #include <stdlib.h>
 
 class sobel : public frei0r::filter