diff --git a/CMakeLists.txt b/CMakeLists.txt index 96d4c85e..731c108b 100644 --- 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 b/include/frei0r/blur.h similarity index 100% rename from include/blur.h rename to include/frei0r/blur.h diff --git a/include/frei0r_cairo.h b/include/frei0r/cairo.h similarity index 99% rename from include/frei0r_cairo.h rename to include/frei0r/cairo.h index 797b1f55..c7b33302 100644 --- a/include/frei0r_cairo.h +++ b/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 #include -#include "frei0r_math.h" +#include "frei0r/math.h" /** * String identifiers for gradient types available using Cairo. diff --git a/include/frei0r_cfc.h b/include/frei0r/cfc.h similarity index 100% rename from include/frei0r_cfc.h rename to include/frei0r/cfc.h diff --git a/include/frei0r_colorspace.h b/include/frei0r/colorspace.h similarity index 99% rename from include/frei0r_colorspace.h rename to include/frei0r/colorspace.h index 808859e8..fbccebb9 100644 --- a/include/frei0r_colorspace.h +++ b/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 #include diff --git a/include/frei0r_math.h b/include/frei0r/math.h similarity index 100% rename from include/frei0r_math.h rename to include/frei0r/math.h diff --git a/src/filter/aech0r/aech0r.cpp b/src/filter/aech0r/aech0r.cpp index f628ac89..7aa005a4 100644 --- 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 #include diff --git a/src/filter/alpha0ps/alpha0ps_alphaspot.c b/src/filter/alpha0ps/alpha0ps_alphaspot.c index 2bb8c5b9..4dacf64b 100644 --- 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 #include -#include +#include #include #include #include diff --git a/src/filter/balanc0r/balanc0r.c b/src/filter/balanc0r/balanc0r.c index c52bc159..3914fbf3 100644 --- a/src/filter/balanc0r/balanc0r.c +++ b/src/filter/balanc0r/balanc0r.c @@ -28,7 +28,7 @@ #include #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 index 16df5a7b..5c317c33 100755 --- a/src/filter/blur/fibe.h +++ b/src/filter/blur/fibe.h @@ -69,7 +69,7 @@ and therefore time consuming "walks" through memory. #include #include -#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 index e0f867c6..1738a4de 100644 --- a/src/filter/brightness/brightness.c +++ b/src/filter/brightness/brightness.c @@ -21,7 +21,7 @@ #include #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 index c444f771..a6f26ba4 100644 --- a/src/filter/c0rners/c0rners.c +++ b/src/filter/c0rners/c0rners.c @@ -28,7 +28,7 @@ #include #include #include -#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 index 9e10428e..e01cd70d 100644 --- a/src/filter/cairogradient/cairogradient.c +++ b/src/filter/cairogradient/cairogradient.c @@ -27,7 +27,7 @@ #include #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 index f25100d9..8330a11c 100644 --- a/src/filter/cairoimagegrid/cairoimagegrid.c +++ b/src/filter/cairoimagegrid/cairoimagegrid.c @@ -24,7 +24,7 @@ #include #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 index a57098ae..fdb165bc 100644 --- a/src/filter/cluster/cluster.c +++ b/src/filter/cluster/cluster.c @@ -24,7 +24,7 @@ #include #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 index 4414d4dd..fad7b265 100644 --- 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 index 6c68ff33..51866b42 100644 --- a/src/filter/colordistance/colordistance.c +++ b/src/filter/colordistance/colordistance.c @@ -23,7 +23,7 @@ #include #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 index 995fbbac..9bc0ddea 100644 --- a/src/filter/colorhalftone/colorhalftone.c +++ b/src/filter/colorhalftone/colorhalftone.c @@ -27,7 +27,7 @@ #include #include #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 index 2341531b..8a90809d 100644 --- a/src/filter/colorize/colorize.c +++ b/src/filter/colorize/colorize.c @@ -32,7 +32,7 @@ #include #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 index f171bccd..22efb054 100644 --- a/src/filter/contrast0r/contrast0r.c +++ b/src/filter/contrast0r/contrast0r.c @@ -22,7 +22,7 @@ #include #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 index 2e80a3aa..fc8d0602 100644 --- a/src/filter/curves/curves.c +++ b/src/filter/curves/curves.c @@ -28,7 +28,7 @@ #include #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 index 8d4aa18f..36e5bfcd 100644 --- a/src/filter/dither/dither.c +++ b/src/filter/dither/dither.c @@ -27,7 +27,7 @@ #include #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 index eeb56957..82f091fd 100644 --- 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 class edgeglow : public frei0r::filter diff --git a/src/filter/emboss/emboss.c b/src/filter/emboss/emboss.c index b918979b..6009fcb0 100644 --- a/src/filter/emboss/emboss.c +++ b/src/filter/emboss/emboss.c @@ -27,7 +27,7 @@ #include #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 index bafd0406..be338201 100644 --- 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 #include diff --git a/src/filter/facebl0r/facebl0r.cpp b/src/filter/facebl0r/facebl0r.cpp index fa21a350..0e5c8449 100644 --- a/src/filter/facebl0r/facebl0r.cpp +++ b/src/filter/facebl0r/facebl0r.cpp @@ -20,7 +20,7 @@ #include #include #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 index 580b53b4..c27b4581 100644 --- a/src/filter/facedetect/facedetect.cpp +++ b/src/filter/facedetect/facedetect.cpp @@ -22,7 +22,7 @@ #include #include #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 index dc80989b..2439e5a2 100644 --- a/src/filter/filmgrain/filmgrain.c +++ b/src/filter/filmgrain/filmgrain.c @@ -1,6 +1,6 @@ #include #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 index 7c737fe8..b3f34229 100644 --- a/src/filter/gamma/gamma.c +++ b/src/filter/gamma/gamma.c @@ -22,7 +22,7 @@ #include #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 index 2a5fb4fb..eef39356 100644 --- a/src/filter/gateweave/gateweave.c +++ b/src/filter/gateweave/gateweave.c @@ -1,7 +1,7 @@ #include #include #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 index c887a3e5..34264d0e 100644 --- a/src/filter/glitch0r/glitch0r.c +++ b/src/filter/glitch0r/glitch0r.c @@ -25,7 +25,7 @@ #include #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 index b0572f12..e545ac53 100644 --- a/src/filter/glow/glow.c +++ b/src/filter/glow/glow.c @@ -20,7 +20,7 @@ #include #include "frei0r.h" #include -#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 index 7d52ab9b..2331ef62 100644 --- 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 #include diff --git a/src/filter/lenscorrection/lenscorrection.c b/src/filter/lenscorrection/lenscorrection.c index 85a4a54a..52bc355d 100644 --- a/src/filter/lenscorrection/lenscorrection.c +++ b/src/filter/lenscorrection/lenscorrection.c @@ -22,7 +22,7 @@ #include #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 index a24d60a9..0be39539 100644 --- a/src/filter/levels/levels.c +++ b/src/filter/levels/levels.c @@ -24,7 +24,7 @@ #include #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 index 394e0e39..4571133d 100644 --- a/src/filter/luminance/luminance.c +++ b/src/filter/luminance/luminance.c @@ -22,7 +22,7 @@ #include #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 index bc1448f1..910fdfa2 100644 --- a/src/filter/mask0mate/mask0mate.c +++ b/src/filter/mask0mate/mask0mate.c @@ -20,7 +20,7 @@ #include #include "frei0r.h" #include -#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 index facdfd60..6b8ea0f7 100644 --- a/src/filter/ndvi/ndvi.cpp +++ b/src/filter/ndvi/ndvi.cpp @@ -19,7 +19,7 @@ #include #endif #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #include "gradientlut.hpp" #include #include diff --git a/src/filter/normaliz0r/normaliz0r.c b/src/filter/normaliz0r/normaliz0r.c index cd989104..b8be8f85 100644 --- a/src/filter/normaliz0r/normaliz0r.c +++ b/src/filter/normaliz0r/normaliz0r.c @@ -74,7 +74,7 @@ #include #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 index c1d9d307..4bab84bd 100644 --- 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 #include #include diff --git a/src/filter/posterize/posterize.c b/src/filter/posterize/posterize.c index 12c65c1d..931acd16 100644 --- a/src/filter/posterize/posterize.c +++ b/src/filter/posterize/posterize.c @@ -26,7 +26,7 @@ #include #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 index 65a183e6..dbe6486f 100644 --- 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 index dd40496f..f51cd90f 100644 --- a/src/filter/rgbnoise/rgbnoise.c +++ b/src/filter/rgbnoise/rgbnoise.c @@ -27,7 +27,7 @@ #include #include #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 index e1e7a1da..ee357a37 100644 --- a/src/filter/saturat0r/saturat0r.c +++ b/src/filter/saturat0r/saturat0r.c @@ -21,7 +21,7 @@ #include #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 index 52090ae2..0ad141fd 100644 --- a/src/filter/sigmoidaltransfer/sigmoidaltransfer.c +++ b/src/filter/sigmoidaltransfer/sigmoidaltransfer.c @@ -26,7 +26,7 @@ #include #include #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 index 95a1c72a..f05860f8 100644 --- 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 class sobel : public frei0r::filter diff --git a/src/filter/softglow/softglow.c b/src/filter/softglow/softglow.c index 11000a6f..a6c3cc8e 100644 --- a/src/filter/softglow/softglow.c +++ b/src/filter/softglow/softglow.c @@ -27,8 +27,8 @@ #include #include #include "frei0r.h" -#include "blur.h" -#include "frei0r_math.h" +#include "frei0r/blur.h" +#include "frei0r/math.h" #define SIGMOIDAL_BASE 2 #define SIGMOIDAL_RANGE 20 diff --git a/src/filter/sopsat/sopsat.cpp b/src/filter/sopsat/sopsat.cpp index 952eba29..7d286032 100644 --- a/src/filter/sopsat/sopsat.cpp +++ b/src/filter/sopsat/sopsat.cpp @@ -20,7 +20,7 @@ #include #include #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" /** This filter implements a standard way of color correction proposed by diff --git a/src/filter/squareblur/squareblur.c b/src/filter/squareblur/squareblur.c index 64fed98a..a703c028 100644 --- a/src/filter/squareblur/squareblur.c +++ b/src/filter/squareblur/squareblur.c @@ -24,7 +24,7 @@ #include #include "frei0r.h" -#include "blur.h" +#include "frei0r/blur.h" int f0r_init() { diff --git a/src/filter/three_point_balance/three_point_balance.c b/src/filter/three_point_balance/three_point_balance.c index dab3b61d..7a3a0df2 100644 --- a/src/filter/three_point_balance/three_point_balance.c +++ b/src/filter/three_point_balance/three_point_balance.c @@ -24,7 +24,7 @@ #include #include "frei0r.h" -#include "frei0r_math.h" +#include "frei0r/math.h" typedef struct three_point_balance_instance { diff --git a/src/filter/tint0r/tint0r.c b/src/filter/tint0r/tint0r.c index f3bbb15a..2b965996 100644 --- a/src/filter/tint0r/tint0r.c +++ b/src/filter/tint0r/tint0r.c @@ -21,7 +21,7 @@ #include #include "frei0r.h" -#include "frei0r_math.h" +#include "frei0r/math.h" typedef struct tint0r_instance { diff --git a/src/filter/transparency/transparency.c b/src/filter/transparency/transparency.c index 1da05d56..7fa00c89 100644 --- a/src/filter/transparency/transparency.c +++ b/src/filter/transparency/transparency.c @@ -1,5 +1,5 @@ #include "frei0r.h" -#include "frei0r_math.h" +#include "frei0r/math.h" #include #include diff --git a/src/filter/vignette/vignette.cpp b/src/filter/vignette/vignette.cpp index 3aa72817..2de1aa07 100644 --- a/src/filter/vignette/vignette.cpp +++ b/src/filter/vignette/vignette.cpp @@ -22,7 +22,7 @@ #endif /* _MSC_VER */ #include #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" /** diff --git a/src/mixer2/addition/addition.cpp b/src/mixer2/addition/addition.cpp index 650f8f57..cf5af78c 100644 --- a/src/mixer2/addition/addition.cpp +++ b/src/mixer2/addition/addition.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/addition_alpha/addition_alpha.cpp b/src/mixer2/addition_alpha/addition_alpha.cpp index 92b5f2cb..10f52f48 100644 --- a/src/mixer2/addition_alpha/addition_alpha.cpp +++ b/src/mixer2/addition_alpha/addition_alpha.cpp @@ -20,7 +20,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/alphaatop/alphaatop.cpp b/src/mixer2/alphaatop/alphaatop.cpp index 131c636d..3e5b37f5 100644 --- a/src/mixer2/alphaatop/alphaatop.cpp +++ b/src/mixer2/alphaatop/alphaatop.cpp @@ -18,7 +18,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #include diff --git a/src/mixer2/alphain/alphain.cpp b/src/mixer2/alphain/alphain.cpp index 0725b116..d7e072c8 100644 --- a/src/mixer2/alphain/alphain.cpp +++ b/src/mixer2/alphain/alphain.cpp @@ -18,7 +18,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #include diff --git a/src/mixer2/alphaout/alphaout.cpp b/src/mixer2/alphaout/alphaout.cpp index 596616a9..c6c585c9 100644 --- a/src/mixer2/alphaout/alphaout.cpp +++ b/src/mixer2/alphaout/alphaout.cpp @@ -18,7 +18,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #include diff --git a/src/mixer2/alphaover/alphaover.cpp b/src/mixer2/alphaover/alphaover.cpp index 8d36062e..b83e7c25 100644 --- a/src/mixer2/alphaover/alphaover.cpp +++ b/src/mixer2/alphaover/alphaover.cpp @@ -18,7 +18,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #include diff --git a/src/mixer2/alphaxor/alphaxor.cpp b/src/mixer2/alphaxor/alphaxor.cpp index 5cdcc628..3213560b 100644 --- a/src/mixer2/alphaxor/alphaxor.cpp +++ b/src/mixer2/alphaxor/alphaxor.cpp @@ -18,7 +18,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #include diff --git a/src/mixer2/blend/blend.cpp b/src/mixer2/blend/blend.cpp index 9387af9b..20ac8844 100644 --- a/src/mixer2/blend/blend.cpp +++ b/src/mixer2/blend/blend.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/burn/burn.cpp b/src/mixer2/burn/burn.cpp index e5e6eb1e..66622d43 100644 --- a/src/mixer2/burn/burn.cpp +++ b/src/mixer2/burn/burn.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/cairoaffineblend/cairoaffineblend.c b/src/mixer2/cairoaffineblend/cairoaffineblend.c index 2b0311c4..a475b52d 100644 --- a/src/mixer2/cairoaffineblend/cairoaffineblend.c +++ b/src/mixer2/cairoaffineblend/cairoaffineblend.c @@ -27,7 +27,7 @@ #include #include "frei0r.h" -#include "frei0r_cairo.h" +#include "frei0r/cairo.h" double PI=3.14159265358979; diff --git a/src/mixer2/cairoblend/cairoblend.c b/src/mixer2/cairoblend/cairoblend.c index 967c4cc2..1fa1ac0d 100644 --- a/src/mixer2/cairoblend/cairoblend.c +++ b/src/mixer2/cairoblend/cairoblend.c @@ -26,7 +26,7 @@ #include #include "frei0r.h" -#include "frei0r_cairo.h" +#include "frei0r/cairo.h" typedef struct cairo_blend_instance { diff --git a/src/mixer2/color_only/color_only.cpp b/src/mixer2/color_only/color_only.cpp index 10a9d8bc..b83f21ff 100644 --- a/src/mixer2/color_only/color_only.cpp +++ b/src/mixer2/color_only/color_only.cpp @@ -19,8 +19,8 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" -#include "frei0r_colorspace.h" +#include "frei0r/math.h" +#include "frei0r/colorspace.h" #define NBYTES 4 diff --git a/src/mixer2/composition/composition.c b/src/mixer2/composition/composition.c index 926d7734..bac18946 100644 --- a/src/mixer2/composition/composition.c +++ b/src/mixer2/composition/composition.c @@ -21,7 +21,7 @@ #include #include "frei0r.h" -#include "frei0r_math.h" +#include "frei0r/math.h" typedef struct composition_instance { diff --git a/src/mixer2/darken/darken.cpp b/src/mixer2/darken/darken.cpp index 002aeabe..b20df85f 100644 --- a/src/mixer2/darken/darken.cpp +++ b/src/mixer2/darken/darken.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/difference/difference.cpp b/src/mixer2/difference/difference.cpp index 9a6cb972..c0f34877 100644 --- a/src/mixer2/difference/difference.cpp +++ b/src/mixer2/difference/difference.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/divide/divide.cpp b/src/mixer2/divide/divide.cpp index da9ec1cb..4bff77b5 100644 --- a/src/mixer2/divide/divide.cpp +++ b/src/mixer2/divide/divide.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/dodge/dodge.cpp b/src/mixer2/dodge/dodge.cpp index 47cd6fac..4190e67c 100644 --- a/src/mixer2/dodge/dodge.cpp +++ b/src/mixer2/dodge/dodge.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/grain_extract/grain_extract.cpp b/src/mixer2/grain_extract/grain_extract.cpp index 5e5e5194..3f047a24 100644 --- a/src/mixer2/grain_extract/grain_extract.cpp +++ b/src/mixer2/grain_extract/grain_extract.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/grain_merge/grain_merge.cpp b/src/mixer2/grain_merge/grain_merge.cpp index 6f88e951..9decc1c4 100644 --- a/src/mixer2/grain_merge/grain_merge.cpp +++ b/src/mixer2/grain_merge/grain_merge.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/hardlight/hardlight.cpp b/src/mixer2/hardlight/hardlight.cpp index 07d55ddf..9051be06 100644 --- a/src/mixer2/hardlight/hardlight.cpp +++ b/src/mixer2/hardlight/hardlight.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/hue/hue.cpp b/src/mixer2/hue/hue.cpp index 3304af4b..4dc66b2b 100644 --- a/src/mixer2/hue/hue.cpp +++ b/src/mixer2/hue/hue.cpp @@ -19,8 +19,8 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" -#include "frei0r_colorspace.h" +#include "frei0r/math.h" +#include "frei0r/colorspace.h" #define NBYTES 4 diff --git a/src/mixer2/lighten/lighten.cpp b/src/mixer2/lighten/lighten.cpp index 76922b99..56a36e4b 100644 --- a/src/mixer2/lighten/lighten.cpp +++ b/src/mixer2/lighten/lighten.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/multiply/multiply.cpp b/src/mixer2/multiply/multiply.cpp index 41de211f..30d9042d 100644 --- a/src/mixer2/multiply/multiply.cpp +++ b/src/mixer2/multiply/multiply.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/overlay/overlay.cpp b/src/mixer2/overlay/overlay.cpp index 75386ca9..dd48fb79 100644 --- a/src/mixer2/overlay/overlay.cpp +++ b/src/mixer2/overlay/overlay.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/saturation/saturation.cpp b/src/mixer2/saturation/saturation.cpp index 4e8aeb9d..89a786e3 100644 --- a/src/mixer2/saturation/saturation.cpp +++ b/src/mixer2/saturation/saturation.cpp @@ -19,8 +19,8 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" -#include "frei0r_colorspace.h" +#include "frei0r/math.h" +#include "frei0r/colorspace.h" #define NBYTES 4 diff --git a/src/mixer2/screen/screen.cpp b/src/mixer2/screen/screen.cpp index 7b82e0cd..62813b4a 100644 --- a/src/mixer2/screen/screen.cpp +++ b/src/mixer2/screen/screen.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/softlight/softlight.cpp b/src/mixer2/softlight/softlight.cpp index 98aef94b..42936ac2 100644 --- a/src/mixer2/softlight/softlight.cpp +++ b/src/mixer2/softlight/softlight.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/subtract/subtract.cpp b/src/mixer2/subtract/subtract.cpp index 93c509e7..7ef49a79 100644 --- a/src/mixer2/subtract/subtract.cpp +++ b/src/mixer2/subtract/subtract.cpp @@ -19,7 +19,7 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" +#include "frei0r/math.h" #define NBYTES 4 #define ALPHA 3 diff --git a/src/mixer2/value/value.cpp b/src/mixer2/value/value.cpp index 96a48cb0..47883861 100644 --- a/src/mixer2/value/value.cpp +++ b/src/mixer2/value/value.cpp @@ -19,8 +19,8 @@ */ #include "frei0r.hpp" -#include "frei0r_math.h" -#include "frei0r_colorspace.h" +#include "frei0r/math.h" +#include "frei0r/colorspace.h" #define NBYTES 4