<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bfe5bb49d80f942e1bf23a183cc91ff6641ca1ca">https://github.com/macports/macports-ports/commit/bfe5bb49d80f942e1bf23a183cc91ff6641ca1ca</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bfe5bb49d80 rawproc: new port in graphics
</span>bfe5bb49d80 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bfe5bb49d80f942e1bf23a183cc91ff6641ca1ca
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Thu Jun 6 18:58:44 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> rawproc: new port in graphics
</span>---
graphics/rawproc/Portfile | 101 +++++++++++++++++++++
.../3cca5cf63c3d466f6ffea1c771e4f556c67509d4.patch | 24 +++++
.../4c5326dcd34f1ffa221a884d0bfb30a44c680848.patch | 25 +++++
.../626a36fdd1f12cb91f1f9fca944046e1ef69a656.patch | 20 ++++
.../bea9e18969953ce3cdc5bc28be60219a05994c60.patch | 56 ++++++++++++
5 files changed, 226 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawproc/Portfile b/graphics/rawproc/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b1305c42cfc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawproc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,101 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup legacysupport 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup wxWidgets 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# clock_gettime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup butcherg rawproc 1.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories graphics
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Select RAW processing routines
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description This is a project that aims to make some of RawTherapeeʼs \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ highly optimized raw processing routines readily available \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for other FOSS photo editing software.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+distname ${name}-${version}.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 586f7539e7de2b23b060b885a75b4a28a799d901 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b184e439edd737399c70efc826a7c93bf31eeaa6e544058a675888e30b81b868 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2329488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patches from upstream, drop with next release:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/butcherg/rawproc/issues/25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args-replace -p0 -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles bea9e18969953ce3cdc5bc28be60219a05994c60.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 626a36fdd1f12cb91f1f9fca944046e1ef69a656.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4c5326dcd34f1ffa221a884d0bfb30a44c680848.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3cca5cf63c3d466f6ffea1c771e4f556c67509d4.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:bin/pkg-config:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:wget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:exiv2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lcms2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:lensfun \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:include/turbojpeg.h:libjpeg-turbo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpng \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libraw \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:librtprocess \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:tiff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.openmp_version 2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.cxxflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Wno-non-pod-varargs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -L${prefix}/lib/libomp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -lomp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} > 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${os.platform} eq "darwin" && ${os.major} > 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxWidgets-3.0-cxx11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wxWidgets.use wxGTK-3.0-cxx11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:${wxWidgets.port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DwxWidgets_CONFIG_EXECUTABLE:FILEPATH=${wxWidgets.wxconfig}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DEXIV2=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLCMS2=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLENSFUN=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBRAW=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBRTPROCESS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGMIC=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target all conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${cmake.build_dir}/rawproc ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${cmake.build_dir}/exif ${destroot}${prefix}/bin/rawproc-exif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${cmake.build_dir}/img ${destroot}${prefix}/bin/rawproc-img
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${cmake.build_dir}/wxcmd ${destroot}${prefix}/bin/rawproc-wxcmd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.redirect_bins rawproc rawproc-exif rawproc-img rawproc-wxcmd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${prefix}/share/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${cmake.build_dir}/${name}.conf ${destroot}${prefix}/share/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+A generated config file has been placed into $prefix/share/$name folder.\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Please copy it to ~/.$name and edit if needed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawproc/files/3cca5cf63c3d466f6ffea1c771e4f556c67509d4.patch b/graphics/rawproc/files/3cca5cf63c3d466f6ffea1c771e4f556c67509d4.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..194ed9eabc6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawproc/files/3cca5cf63c3d466f6ffea1c771e4f556c67509d4.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 3cca5cf63c3d466f6ffea1c771e4f556c67509d4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Glenn Butcher <glenn.butcher@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 5 Jun 2024 15:53:19 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] fix: oops, forgot the include...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/fileutil.cpp | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/fileutil.cpp b/src/fileutil.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 27fa434..5827265 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/fileutil.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/fileutil.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6,6 +6,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <fstream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <filesystem>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <mach-o/dyld.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef _WIN32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <windows.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <shlobj.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawproc/files/4c5326dcd34f1ffa221a884d0bfb30a44c680848.patch b/graphics/rawproc/files/4c5326dcd34f1ffa221a884d0bfb30a44c680848.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d46ca9593e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawproc/files/4c5326dcd34f1ffa221a884d0bfb30a44c680848.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4c5326dcd34f1ffa221a884d0bfb30a44c680848 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Glenn Butcher <glenn.butcher@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 5 Jun 2024 15:50:15 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] fix: add Apple logic to GetExeDir()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/fileutil.cpp | 5 +++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/fileutil.cpp b/src/fileutil.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2693d3d..27fa434 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/fileutil.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/fileutil.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,6 +82,11 @@ std::string getExeDir(std::string filename)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dir = std::string(exePath);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dir.erase(dir.find_last_of('\\'));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (filename != "") dir.append("\\"+filename);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ char buf [PATH_MAX];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ uint32_t bufsize = PATH_MAX;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(!_NSGetExecutablePath(buf, &bufsize))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ dir = std::string(buf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char exePath[PATH_MAX];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t len = readlink("/proc/self/exe", exePath, sizeof(exePath));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawproc/files/626a36fdd1f12cb91f1f9fca944046e1ef69a656.patch b/graphics/rawproc/files/626a36fdd1f12cb91f1f9fca944046e1ef69a656.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a2c6abb2c13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawproc/files/626a36fdd1f12cb91f1f9fca944046e1ef69a656.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 626a36fdd1f12cb91f1f9fca944046e1ef69a656 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Glenn Butcher <glenn.butcher@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 5 Jun 2024 11:15:59 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] fix: guard case
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/PicProcessorTone.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/PicProcessorTone.h b/src/PicProcessorTone.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0ff896b2..88a2c937 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/PicProcessorTone.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/PicProcessorTone.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef __PICPROCESSORTONE_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define __PICPROCESSORTone_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __PICPROCESSORTONE_H__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "PicProcessor.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/rawproc/files/bea9e18969953ce3cdc5bc28be60219a05994c60.patch b/graphics/rawproc/files/bea9e18969953ce3cdc5bc28be60219a05994c60.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e0e36d34ad7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/rawproc/files/bea9e18969953ce3cdc5bc28be60219a05994c60.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From bea9e18969953ce3cdc5bc28be60219a05994c60 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Glenn Butcher <glenn.butcher@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 5 Jun 2024 11:11:09 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] fix: spaces between '> >'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/gimage.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/gimage/gimage.h | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/gimage_process.cpp | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 4 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/gimage.cpp b/src/gimage.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4a1523e..8b951ec 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/gimage.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/gimage.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5854,7 +5854,7 @@ GIMAGE_ERROR gImage::ApplyDistortionCorrectionAdobeWarpRetilinear(float kr0, flo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // definition by their numerical sequence in the definition. The vector<vector<float>> contains the correction parameters
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // for each of the red, green and blue planes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-GIMAGE_ERROR gImage::ApplyDistortionCorrectionAdobeWarpRetilinear(std::vector<std::vector<float>> kr, std::vector<std::vector<float>> kt, float cpx, float cpy, int threadcount)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++GIMAGE_ERROR gImage::ApplyDistortionCorrectionAdobeWarpRetilinear(std::vector<std::vector<float> > kr, std::vector<std::vector<float> > kt, float cpx, float cpy, int threadcount)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //the blank destination image:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<pix> src = image;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/gimage/gimage.h b/src/gimage/gimage.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6b677cd..78a7aca 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/gimage/gimage.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/gimage/gimage.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -352,7 +352,7 @@ class gImage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GIMAGE_ERROR ApplyDistortionCorrectionPTLens(float a, float b, float c, float d, int threadcount);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GIMAGE_ERROR ApplyDistortionCorrectionAdobe(float k0, float k1, float k2, float k3, int threadcount); //simple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GIMAGE_ERROR ApplyDistortionCorrectionAdobeWarpRetilinear(float kr0, float kr1, float kr2, float kr3, float kt0, float kt1, float cpx, float cpy, int threadcount); //full implementation of the adobe opcode, except all channels are manipulated by a single coefficient set.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GIMAGE_ERROR ApplyDistortionCorrectionAdobeWarpRetilinear(std::vector<std::vector<float>> kr, std::vector<std::vector<float>> kt, float cpx, float cpy, int threadcount); //full adobe opcode implementation, including distinct sets of k parameters for each plane of the image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GIMAGE_ERROR ApplyDistortionCorrectionAdobeWarpRetilinear(std::vector<std::vector<float> > kr, std::vector<std::vector<float> > kt, float cpx, float cpy, int threadcount); //full adobe opcode implementation, including distinct sets of k parameters for each plane of the image
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GIMAGE_ERROR ApplyVignettingCorrectionAdobeFixVignetteRadial(float k0, float k1, float k2, float k3, float k4, float cpx, float cpy, int threadcount); //full implementation of the adobe opcode, except all channels are manipulated by a single coefficient set.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef USE_GMIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/gimage_process.cpp b/src/gimage_process.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cbb54d9..bb0297e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/gimage_process.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/gimage_process.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1029,12 +1029,12 @@ std::map<std::string,std::string> process_lensdistortion(gImage &dib, std::map<s
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //full three-pane lensdistortion:adobe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<float> k_r = {k0, k1, k2, k3};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::vector<std::vector<float>> kr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::vector<std::vector<float> > kr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kr.push_back(k_r);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kr.push_back(k_r);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kr.push_back(k_r);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::vector<float> k_t = {0.0, 0.0}; //hard-code no tangential distortion correction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::vector<std::vector<float>> kt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::vector<std::vector<float> > kt;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kt.push_back(k_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kt.push_back(k_t);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kt.push_back(k_t);
</span></pre><pre style='margin:0'>
</pre>