Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package librtprocess for openSUSE:Factory checked in at 2022-04-28 23:07:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librtprocess (Old) and /work/SRC/openSUSE:Factory/.librtprocess.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "librtprocess" Thu Apr 28 23:07:57 2022 rev:3 rq:973543 version:0.12.0+20211228 Changes: -------- --- /work/SRC/openSUSE:Factory/librtprocess/librtprocess.changes 2021-06-07 22:44:13.868559161 +0200 +++ /work/SRC/openSUSE:Factory/.librtprocess.new.1538/librtprocess.changes 2022-04-28 23:08:01.308691014 +0200 @@ -1,0 +2,11 @@ +Thu Apr 28 06:20:11 UTC 2022 - Paolo Stivanin <[email protected]> + +- Update to version 0.12.0+20211228: + * Update amaze.cc + * Update CA_correct.cc + * Update rcd.cc + * Update markesteijn.cc + * Various small fixes +- Drop add-missing-include.patch + +------------------------------------------------------------------- Old: ---- add-missing-include.patch librtprocess-0.12.0+20210408.tar.xz New: ---- librtprocess-0.12.0+20211228.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librtprocess.spec ++++++ --- /var/tmp/diff_new_pack.3Eqrt4/_old 2022-04-28 23:08:02.412692217 +0200 +++ /var/tmp/diff_new_pack.3Eqrt4/_new 2022-04-28 23:08:02.416692222 +0200 @@ -1,7 +1,7 @@ # # spec file for package librtprocess # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,13 @@ Name: librtprocess -Version: 0.12.0+20210408 +Version: 0.12.0+20211228 Release: 0 Summary: A collection of functions for processing photos License: BSL-1.0 AND GPL-3.0-or-later Group: Development/Libraries/C and C++ URL: https://github.com/CarVac/librtprocess Source: %{name}-%{version}.tar.xz -Patch0: add-missing-include.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkg-config @@ -57,11 +56,10 @@ This package holds the development files. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build -%cmake . +%cmake %cmake_build %install ++++++ _service ++++++ --- /var/tmp/diff_new_pack.3Eqrt4/_old 2022-04-28 23:08:02.448692257 +0200 +++ /var/tmp/diff_new_pack.3Eqrt4/_new 2022-04-28 23:08:02.452692261 +0200 @@ -4,7 +4,6 @@ <param name="scm">git</param> <param name="versionformat">0.12.0+%cd</param> <param name="revision">master</param> - <param name="changesgenerate">enable</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.3Eqrt4/_old 2022-04-28 23:08:02.472692283 +0200 +++ /var/tmp/diff_new_pack.3Eqrt4/_new 2022-04-28 23:08:02.472692283 +0200 @@ -1,5 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/CarVac/librtprocess.git</param> - <param name="changesrevision">b8990f7fa77cf08ffdcbe136a1547f5b1c4b0726</param></service></servicedata> + <param name="changesrevision">d0c5bdb6feda87f629f479234578a88a8195f628</param></service></servicedata> +(No newline at EOF) ++++++ librtprocess-0.12.0+20210408.tar.xz -> librtprocess-0.12.0+20211228.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/.gitignore new/librtprocess-0.12.0+20211228/.gitignore --- old/librtprocess-0.12.0+20210408/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/librtprocess-0.12.0+20211228/.gitignore 2021-12-28 17:48:06.000000000 +0100 @@ -0,0 +1,2 @@ +build/* +pkgconfig/rtprocess.pc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/CompilerChecks.cmake new/librtprocess-0.12.0+20211228/CompilerChecks.cmake --- old/librtprocess-0.12.0+20210408/CompilerChecks.cmake 2021-04-08 19:13:23.000000000 +0200 +++ new/librtprocess-0.12.0+20211228/CompilerChecks.cmake 2021-12-28 17:48:06.000000000 +0100 @@ -63,7 +63,7 @@ check_cxx_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR) if (WITH_STACK_PROTECTOR) list(APPEND SUPPORTED_CXX_COMPILER_FLAGS "-fstack-protector") - # This is needed as Solaris has a seperate libssp + # This is needed as Solaris has a separate libssp if (SOLARIS) list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector") endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/README.md new/librtprocess-0.12.0+20211228/README.md --- old/librtprocess-0.12.0+20210408/README.md 2021-04-08 19:13:23.000000000 +0200 +++ new/librtprocess-0.12.0+20211228/README.md 2021-12-28 17:48:06.000000000 +0100 @@ -17,6 +17,8 @@ . rawproc https://github.com/butcherg/rawproc +. MLVApp https://github.com/ilia3101/MLV-App + . RawTherapee https://github.com/Beep6581/RawTherapee ... the latter is where currently all the code comes from ;-) @@ -110,7 +112,7 @@ for (unsigned i=1; i<h; i++) blue[i] = blue[i - 1] + w; - //loads the internal data to the librtprocess rawData structure. The interal data's red channel + //loads the internal data to the librtprocess rawData structure. The internal data's red channel //is arbitrarily chosen as a monochrome image is represented R=G=B: #pragma omp parallel for num_threads(threadcount) for (unsigned y=0; y<h; y++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/cmake/Modules/DefineCMakeDefaults.cmake new/librtprocess-0.12.0+20211228/cmake/Modules/DefineCMakeDefaults.cmake --- old/librtprocess-0.12.0+20210408/cmake/Modules/DefineCMakeDefaults.cmake 2021-04-08 19:13:23.000000000 +0200 +++ new/librtprocess-0.12.0+20211228/cmake/Modules/DefineCMakeDefaults.cmake 2021-12-28 17:48:06.000000000 +0100 @@ -6,7 +6,7 @@ # Put the include dirs which are in the source or build tree # before all other include dirs, so the headers in the sources -# are prefered over the already installed ones +# are preferred over the already installed ones # since cmake 2.4.1 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/src/demosaic/ahd.cc new/librtprocess-0.12.0+20211228/src/demosaic/ahd.cc --- old/librtprocess-0.12.0+20210408/src/demosaic/ahd.cc 2021-04-08 19:13:23.000000000 +0200 +++ new/librtprocess-0.12.0+20211228/src/demosaic/ahd.cc 2021-12-28 17:48:06.000000000 +0100 @@ -187,7 +187,7 @@ } } - // Combine the most homogenous pixels for the final result: + // Combine the most homogeneous pixels for the final result: for (int row = top + 3; row < top + TS - 3 && row < height - 5; row++) { int tr = row - top; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/src/demosaic/amaze.cc new/librtprocess-0.12.0+20211228/src/demosaic/amaze.cc --- old/librtprocess-0.12.0+20210408/src/demosaic/amaze.cc 2021-04-08 19:13:23.000000000 +0200 +++ new/librtprocess-0.12.0+20211228/src/demosaic/amaze.cc 2021-12-28 17:48:06.000000000 +0100 @@ -41,7 +41,7 @@ using namespace librtprocess; -rpError amaze_demosaic(int raw_width, int raw_height, int winx, int winy, int winw, int winh, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, double initGain, int border, float inputScale, float outputScale, size_t chunkSize, bool measure) +rpError amaze_demosaic(int raw_width, int raw_height, int winx, int winy, int winw, int winh, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, double initGain, int border, float inputScale, float outputScale, std::size_t chunkSize, bool measure) { BENCHFUN std::unique_ptr<StopWatch> stop; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/src/demosaic/igv.cc new/librtprocess-0.12.0+20211228/src/demosaic/igv.cc --- old/librtprocess-0.12.0+20210408/src/demosaic/igv.cc 2021-04-08 19:13:23.000000000 +0200 +++ new/librtprocess-0.12.0+20211228/src/demosaic/igv.cc 2021-12-28 17:48:06.000000000 +0100 @@ -453,10 +453,10 @@ const int width = winw, height = winh; const int v1 = 1 * width, v2 = 2 * width, v3 = 3 * width, v4 = 4 * width, v5 = 5 * width, v6 = 6 * width; - float *rgbarray = (float (*)) malloc((width * height) * sizeof(float)); + float *rgbarray = (float (*)) calloc((width * height * 3), sizeof(float)); float *vdif = (float (*)) calloc(width * height / 2, sizeof * vdif); float *hdif = (float (*)) calloc(width * height / 2, sizeof * hdif); - float *chrarray = (float (*)) calloc(width * height, sizeof(float)); + float *chrarray = (float (*)) calloc(width * height * 2, sizeof(float)); if(!rgbarray || !vdif || !hdif || !chrarray) { if (rgbarray) { @@ -474,14 +474,15 @@ return RP_MEMORY_ERROR; } - float* rgb[2]; + float* rgb[3]; rgb[0] = rgbarray; - rgb[1] = rgbarray + (width * height) / 2; + rgb[1] = rgbarray + (width * height); + rgb[2] = rgbarray + 2*(width * height); float* chr[4]; chr[0] = chrarray; - chr[1] = chrarray + (width * height) / 2; + chr[1] = chrarray + (width * height); // mapped chr[2] and chr[3] to hdif and hdif, because these are out of use, when chr[2] and chr[3] are used chr[2] = hdif; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/src/demosaic/markesteijn.cc new/librtprocess-0.12.0+20211228/src/demosaic/markesteijn.cc --- old/librtprocess-0.12.0+20210408/src/demosaic/markesteijn.cc 2021-04-08 19:13:23.000000000 +0200 +++ new/librtprocess-0.12.0+20211228/src/demosaic/markesteijn.cc 2021-12-28 17:48:06.000000000 +0100 @@ -126,7 +126,7 @@ */ using namespace librtprocess; -rpError markesteijn_demosaic (int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned xtrans[6][6], const float rgb_cam[3][4], const std::function<bool(double)> &setProgCancel, const int passes, const bool useCieLab, size_t chunkSize, bool measure) +rpError markesteijn_demosaic (int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned xtrans[6][6], const float rgb_cam[3][4], const std::function<bool(double)> &setProgCancel, const int passes, const bool useCieLab, std::size_t chunkSize, bool measure) { BENCHFUN std::unique_ptr<StopWatch> stop; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/src/demosaic/rcd.cc new/librtprocess-0.12.0+20211228/src/demosaic/rcd.cc --- old/librtprocess-0.12.0+20210408/src/demosaic/rcd.cc 2021-04-08 19:13:23.000000000 +0200 +++ new/librtprocess-0.12.0+20211228/src/demosaic/rcd.cc 2021-12-28 17:48:06.000000000 +0100 @@ -42,7 +42,7 @@ // coefficients in an exact, shorter and more performant formula. // In cooperation with Hanno Schwalm ([email protected]) and Luis Sanz Rodriguez this has been tuned for performance. -rpError rcd_demosaic(int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, size_t chunkSize, bool measure, bool multiThread) +rpError rcd_demosaic(int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, std::size_t chunkSize, bool measure, bool multiThread) { BENCHFUN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/src/include/LUT.h new/librtprocess-0.12.0+20211228/src/include/LUT.h --- old/librtprocess-0.12.0+20210408/src/include/LUT.h 2021-04-08 19:13:23.000000000 +0200 +++ new/librtprocess-0.12.0+20211228/src/include/LUT.h 2021-12-28 17:48:06.000000000 +0100 @@ -518,7 +518,7 @@ } } - // compress a LUT<uint32_t> with size y into a LUT<uint32_t> with size x (y>x) by using the passTrough LUT to calculate indexes + // compress a LUT<uint32_t> with size y into a LUT<uint32_t> with size x (y>x) by using the passThrough LUT to calculate indexes template<typename U = T, typename = typename std::enable_if<std::is_same<U, std::uint32_t>::value>::type> void compressTo(LUT<T> &dest, unsigned int numVals, const LUT<float> &passThrough) const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/src/include/librtprocess.h new/librtprocess-0.12.0+20211228/src/include/librtprocess.h --- old/librtprocess-0.12.0+20210408/src/include/librtprocess.h 2021-04-08 19:13:23.000000000 +0200 +++ new/librtprocess-0.12.0+20211228/src/include/librtprocess.h 2021-12-28 17:48:06.000000000 +0100 @@ -20,25 +20,28 @@ #ifndef _LIBRTPROCESS_ #define _LIBRTPROCESS_ +#include <stddef.h> + #include <functional> +#include <cstddef> enum rpError {RP_NO_ERROR, RP_MEMORY_ERROR, RP_WRONG_CFA, RP_CACORRECT_ERROR}; rpError bayerborder_demosaic(int winw, int winh, int lborders, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2]); void xtransborder_demosaic(int winw, int winh, int border, const float * const *rawData, float **red, float **green, float **blue, const unsigned xtrans[6][6]); rpError ahd_demosaic (int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const float rgb_cam[3][4], const std::function<bool(double)> &setProgCancel); -rpError amaze_demosaic(int raw_width, int raw_height, int winx, int winy, int winw, int winh, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, double initGain, int border, float inputScale, float outputScale, size_t chunkSize = 2, bool measure = false); +rpError amaze_demosaic(int raw_width, int raw_height, int winx, int winy, int winw, int winh, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, double initGain, int border, float inputScale, float outputScale, std::size_t chunkSize = 2, bool measure = false); rpError bayerfast_demosaic(int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, double initGain); rpError dcb_demosaic(int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, int iterations, bool dcb_enhance); rpError hphd_demosaic(int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel); -rpError rcd_demosaic(int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, size_t chunkSize = 2, bool measure = false, bool multiThread = true); -rpError markesteijn_demosaic(int width, int height, const float * const *rawdata, float **red, float **green, float **blue, const unsigned xtrans[6][6], const float rgb_cam[3][4], const std::function<bool(double)> &setProgCancel, const int passes, const bool useCieLab, size_t chunkSize = 2, bool measure = false); +rpError rcd_demosaic(int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, std::size_t chunkSize = 2, bool measure = false, bool multiThread = true); +rpError markesteijn_demosaic(int width, int height, const float * const *rawdata, float **red, float **green, float **blue, const unsigned xtrans[6][6], const float rgb_cam[3][4], const std::function<bool(double)> &setProgCancel, const int passes, const bool useCieLab, std::size_t chunkSize = 2, bool measure = false); rpError xtransfast_demosaic(int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned xtrans[6][6], const std::function<bool(double)> &setProgCancel); rpError vng4_demosaic (int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel); rpError igv_demosaic(int winw, int winh, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel); rpError lmmse_demosaic(int width, int height, const float * const *rawData, float **red, float **green, float **blue, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, int iterations); // for CA_correct rawDataIn and rawDataOut may point to the same buffer. That's handled fine inside CA_correct -rpError CA_correct(int winx, int winy, int winw, int winh, const bool autoCA, size_t autoIterations, const double cared, const double cablue, bool avoidColourshift, const float * const *rawDataIn, float **rawDataOut, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, double fitParams[2][2][16], bool fitParamsIn, float inputScale = 65535.f, float outputScale = 65535.f, size_t chunkSize = 2, bool measure = false); +rpError CA_correct(int winx, int winy, int winw, int winh, const bool autoCA, std::size_t autoIterations, const double cared, const double cablue, bool avoidColourshift, const float * const *rawDataIn, float **rawDataOut, const unsigned cfarray[2][2], const std::function<bool(double)> &setProgCancel, double fitParams[2][2][16], bool fitParamsIn, float inputScale = 65535.f, float outputScale = 65535.f, size_t chunkSize = 2, bool measure = false); rpError HLRecovery_inpaint(const int width, const int height, float **red, float **green, float **blue, const float chmax[3], const float clmax[3], const std::function<bool(double)> &setProgCancel); #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtprocess-0.12.0+20210408/src/preprocess/CA_correct.cc new/librtprocess-0.12.0+20211228/src/preprocess/CA_correct.cc --- old/librtprocess-0.12.0+20210408/src/preprocess/CA_correct.cc 2021-04-08 19:13:23.000000000 +0200 +++ new/librtprocess-0.12.0+20211228/src/preprocess/CA_correct.cc 2021-12-28 17:48:06.000000000 +0100 @@ -119,7 +119,7 @@ int winw, int winh, const bool autoCA, - size_t autoIterations, + std::size_t autoIterations, const double cared, const double cablue, bool avoidColourshift, @@ -131,7 +131,7 @@ bool fitParamsIn, float inputScale, float outputScale, - size_t chunkSize, + std::size_t chunkSize, bool measure ) {
