liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into gtk3

Browse Source
This commit is contained in:
Morgan Hardwood
2015-08-12 22:11:52 +02:00
parent e1c07cc59c 294c3cccdc
commit 92b9842b47
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
README.md
View File

@@ -17,6 +17,9 @@ http://rawtherapee.com/shared/source/
Source code documentation: Source code documentation:
http://michaelezra.com/projects/rt/documentation/ http://michaelezra.com/projects/rt/documentation/
Git handbook:
http://git-scm.com/book/en/
## Compilation, patching and Git ## Compilation, patching and Git
Refer to RawPedia for dependency requirements: Refer to RawPedia for dependency requirements:
http://rawpedia.rawtherapee.com/Linux http://rawpedia.rawtherapee.com/Linux
@@ -41,9 +44,9 @@ Then replace the number in `-j8` below with this number. This will make compilat
Now you will make an out-of-source compilation of RawTherapee, it will be built into the ~/repo-rt/build/release folder, and then you will move this folder to your home directory and rename it to "rawtherapee", so make sure there is no ~/rawtherapee folder already! Now you will make an out-of-source compilation of RawTherapee, it will be built into the ~/repo-rt/build/release folder, and then you will move this folder to your home directory and rename it to "rawtherapee", so make sure there is no ~/rawtherapee folder already!
``` ```
mkdir build && cd build mkdir build && cd build && \
cmake -DCMAKE_BUILD_TYPE="release" -DPROC_TARGET_NUMBER="2" -DBUILD_BUNDLE="ON" -DBINDIR="." -DDATADIR="." -DCACHE_NAME_SUFFIX=4 cmake -DCMAKE_BUILD_TYPE="release" -DPROC_TARGET_NUMBER="2" -DBUILD_BUNDLE="ON" -DBINDIR="." -DDATADIR="." -DCACHE_NAME_SUFFIX=4 .. && \
make -j8 install make -j8 install && \
mv release ~/rawtherapee mv release ~/rawtherapee
``` ```

8
rtengine/ipwavelet.cc
View File

@@ -1157,7 +1157,7 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int
for(col = 0; col < rowWidth - 3; col += 4) { for(col = 0; col < rowWidth - 3; col += 4) {
av = LVFU(labco->a[i1][col]); av = LVFU(labco->a[i1][col]);
bv = LVFU(labco->b[i1][col]); bv = LVFU(labco->b[i1][col]);
_mm_store_ps(&atan2Buffer[col], xatan2f(bv, av)); STVF(atan2Buffer[col], xatan2f(bv, av));
cv = _mm_sqrt_ps(SQRV(av) + SQRV(bv)); cv = _mm_sqrt_ps(SQRV(av) + SQRV(bv));
yv = av / cv; yv = av / cv;
@@ -1165,9 +1165,9 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int
xyMask = vmaskf_eq(zerov, cv); xyMask = vmaskf_eq(zerov, cv);
yv = vself(xyMask, onev, yv); yv = vself(xyMask, onev, yv);
xv = vself(xyMask, zerov, xv); xv = vself(xyMask, zerov, xv);
_mm_store_ps(&yBuffer[col], yv); STVF(yBuffer[col], yv);
_mm_store_ps(&xBuffer[col], xv); STVF(xBuffer[col], xv);
_mm_store_ps(&chprovBuffer[col], cv / c327d68v); STVF(chprovBuffer[col], cv / c327d68v);
} }