Merge branch 'dev'

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Version History
 
+## 0.7.1 (10/26/2023)
+
+- use a new pre-defined rawtherapee processing profile (Standard Film Curve ISO Low) which addresses an issue where some colors in photos were washed out
+- update test scripts to reference .net7 build of application
+- update container to use Fedora 38
+- updated ImageSharp
+
 ## 0.7.0 (03/14/2023)
 
 - updated to .net 7

Containerfile

@@ -11,7 +11,7 @@ RUN dotnet publish -o /app -c Release -r linux-x64 --no-self-contained
 
 
 # build runtime image
-FROM fedora:37
+FROM fedora:38
 
 RUN dnf install -y \
     dotnet-runtime-7.0 \

pp3/auto_matched_curve_iso_low.pp3 → pp3/standard_film_curve_iso_low.pp3

@@ -1,40 +1,28 @@
-[Version]
-AppVersion=5.3-544-gc2e7d924
-Version=330
+[Exposure]
+Auto=false
+HistogramMatching=false
+CurveMode=FilmLike
+Curve=1;0;0;0.11;0.089999999999999997;0.32000000000000001;0.42999999999999999;0.66000000000000003;0.87;1;1;
 
 [HLRecovery]
 Enabled=true
 Method=Blend
 
-[Exposure]
-Auto=false
-Clip=0.02
-Compensation=0
-Brightness=0
-Contrast=0
-Saturation=0
-Black=0
-HighlightCompr=0
-HighlightComprThreshold=33
-ShadowCompr=50
-HistogramMatching=true
-CurveMode=FilmLike
-CurveMode2=WeightedStd
-Curve=0;
-Curve2=0;
-
 [LensProfile]
 LcMode=lfauto
 UseDistortion=true
 UseVignette=true
 UseCA=false
 
-[RAW]
-CA=true
-
 [Color Management]
 ToneCurve=false
 ApplyLookTable=true
 ApplyBaselineExposureOffset=true
 ApplyHueSatMap=true
 DCPIlluminant=0
+
+[RAW]
+CA=true
+
+[PostDemosaicSharpening]
+Enabled=true

src/SizePhotos/Converters/RawTherapeeConverter.cs

@@ -19,16 +19,11 @@ public Task ConvertAsync(string sourceFile, string destFile)
 
         if (IsRawFile(sourceFile))
         {
-            // default to a pre-specified profile (copy of "/usr/share/rawtherapee/profiles/Generic/Natural 1.pp3")
-            // opts.AddUserSpecifiedPp3Source(Path.Combine(AppContext.BaseDirectory, "natural.pp3"));
-            opts.AddUserSpecifiedPp3Source(Path.Combine(AppContext.BaseDirectory, "auto_matched_curve_iso_low.pp3"));
-
-            // now bump the contrast and saturation a bit
+            opts.AddUserSpecifiedPp3Source(Path.Combine(AppContext.BaseDirectory, "standard_film_curve_iso_low.pp3"));
             opts.AddUserSpecifiedPp3Source(Path.Combine(AppContext.BaseDirectory, "contrast_saturation.pp3"));
         }
         else
         {
-            // default to a neutral profile (generated in app)
             opts.AddUserSpecifiedPp3Source(Path.Combine(AppContext.BaseDirectory, "neutral.pp3"));
         }
 

src/SizePhotos/SizePhotos.csproj

@@ -2,7 +2,7 @@
     <PropertyGroup>
         <Description>Tool to prepare photos for my website</Description>
         <AssemblyTitle>SizePhotos</AssemblyTitle>
-        <VersionPrefix>0.7.0</VersionPrefix>
+        <VersionPrefix>0.7.1</VersionPrefix>
         <Authors>Mike Morano &lt;mmorano@mikeandwan.us&gt;</Authors>
         <TargetFramework>net7.0</TargetFramework>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -23,7 +23,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.0.0" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
         <PackageReference Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
         <PackageReference Include="NExifTool" Version="0.11.0" />
         <PackageReference Include="NRawTherapee" Version="0.4.1" />

test/test.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-dotnet ../src/SizePhotos/bin/Debug/net5.0/SizePhotos.dll -n -p update_test/2015/testdir -w img
+dotnet ../src/SizePhotos/bin/Debug/net7.0/SizePhotos.dll -n -p update_test/2015/testdir -w img

test/test_invalid.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-dotnet ../src/SizePhotos/bin/Debug/net5.0/SizePhotos.dll -i
+dotnet ../src/SizePhotos/bin/Debug/net7.0/SizePhotos.dll -i

test/test_invalid2.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-dotnet ../src/SizePhotos/bin/Debug/net5.0/SizePhotos.dll -r
+dotnet ../src/SizePhotos/bin/Debug/net7.0/SizePhotos.dll -r

test/test_quiet_insert.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-dotnet ../src/SizePhotos/bin/Debug/net5.0/SizePhotos.dll -q -i -c test -o x.sql -p testfiles -w img -y 2016 -r admin -r friend
+dotnet ../src/SizePhotos/bin/Debug/net7.0/SizePhotos.dll -q -i -c test -o x.sql -p testfiles -w img -y 2016 -r admin -r friend

test/test_quiet_noop.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-dotnet ../src/SizePhotos/bin/Debug/net5.0/SizePhotos.dll -q -n -p testfiles
+dotnet ../src/SizePhotos/bin/Debug/net7.0/SizePhotos.dll -q -n -p testfiles

test/test_quiet_update.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-dotnet ../src/SizePhotos/bin/Debug/net5.0/SizePhotos.dll -q -u -o x.sql -p update_test/2015/testdir -w /img
+dotnet ../src/SizePhotos/bin/Debug/net7.0/SizePhotos.dll -q -u -o x.sql -p update_test/2015/testdir -w /img

test/test_review.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-dotnet ../src/SizePhotos/bin/Debug/net5.0/SizePhotos.dll -f -p testfiles
+dotnet ../src/SizePhotos/bin/Debug/net7.0/SizePhotos.dll -f -p testfiles