Commit Graph

627 Commits

Author SHA1 Message Date
Morgan Hardwood
76314b9422 Merge branch 'master' into gtk3 2016-12-18 17:49:03 +01:00
heckflosse
3cc8438cf9 CbDL before black and white no preview when changing exposure, fixes #3539 2016-12-14 14:39:20 +01:00
heckflosse
cc4e7be2df Fix crash with Canon m-raw files when raw crop in camconst.json is defined, #3533 2016-12-14 14:01:05 +01:00
Hombre
e1c5e76c10 Merge branch 'master' into gtk3 2016-12-13 23:00:47 +01:00
Flössie
23f17bd9bc Fully check thumb data size (#3529)
Also, take rotation into account when falling back to
`Thumbnail::loadFromRaw()`.
2016-12-13 20:44:05 +01:00
Morgan Hardwood
5ecd50b1cd Merge branch 'master' into gtk3 2016-12-05 12:01:45 +01:00
Hombre
976fc087bd Removed some debug message left in code 2016-12-03 11:24:11 +01:00
Morgan Hardwood
fd41f4dcd5 Merge branch 'master' into gtk3 2016-11-29 12:28:03 +01:00
Flössie
c5bef4f3bc Make ImageIO load grayscale JPGs and TIFFs (#3515) 2016-11-28 20:57:19 +01:00
heckflosse
053b305d89 Tone curve histogram ignores DCP tone curve, fixes #3512 2016-11-23 17:23:25 +01:00
Hombre
024905a8ca Merge branch 'master' into gtk3 2016-11-11 23:05:29 +01:00
Morgan Hardwood
7cb8781910 camconst.json formatting fix 2016-11-11 09:25:29 +01:00
heckflosse
fda15c124e Improve support for Pentax K-1, Olympus E-M1MarkII and Canon G7 X 2016-11-10 20:13:21 +01:00
Floessie
bda2e6bc6c Merge pull request #3504 from Beep6581/fix-clang-warnings
Fix some Clang warnings reported by @Partha1b
2016-11-10 18:21:19 +01:00
Flössie
2d743bfe7f Provide a better std::enable_if<> solution 2016-11-10 18:04:06 +01:00
Flössie
b3bc325934 Add integral Threshold::operator ==(Threshold)
Kudos to @heckflosse for reminding me what C++11 is about. :)
2016-11-09 20:57:23 +01:00
Flössie
4ee191487e Fix uncritical warnings in rtengine/procparams.h 2016-11-09 19:28:14 +01:00
heckflosse
59e999fbf5 Used stoi instead of atoi 2016-11-08 15:31:48 +01:00
heckflosse
b5094d9d9f Pentax: ISO > 65535 was reported as 65535 in info dialog 2016-11-08 14:06:11 +01:00
heckflosse
f017603478 Enabled property of a tool shoot be first in tool group of pp3 file. Was not the case for Retinex. Fixed. No Issue 2016-11-08 02:25:34 +01:00
Flössie
495c0938f4 Fix Clang warnings and build failure on OSX 10.12
Kudos to Partha over at pixls.us for finding and fixing!
2016-11-06 17:09:27 +01:00
Morgan Hardwood
a961325397 Merge commit 'b961e31' into gtk3 2016-11-05 20:43:58 +01:00
heckflosse
7fe9297c01 better support for Pentax K-70 and XiaoYI M1 2016-10-31 14:43:35 +01:00
Morgan Hardwood
d2526e0f94 Formatting, spelling, grammar and structural changes to camconst.json 2016-10-31 12:04:34 +01:00
Morgan Hardwood
789235188a camconst.json updated by iliasg, #3298 2016-10-31 09:32:12 +01:00
heckflosse
b766110427 Merge branch 'master' into gtk3 2016-10-30 23:04:32 +01:00
heckflosse
99382aa482 Fix non SSE build failure reported by Marcin, no Issue 2016-10-30 22:49:13 +01:00
heckflosse
b16ef8d1f5 Merge master into gtk3 2016-10-28 17:59:47 +02:00
heckflosse
3a346d919d hphd demosaic : left quarter is not demosaiced correctly, fixes #3485 2016-10-27 13:40:30 +02:00
heckflosse
fca99676b6 Fix a bug I introduced some commits ago. Fixes #3476 2016-10-22 18:29:53 +02:00
heckflosse
968f2b06ca Segfault on EAHD, fixes #3474, kudos to Floessie 2016-10-21 12:09:47 +02:00
heckflosse
17ea8b162c Removed printf relicts from softproofing branch 2016-10-21 02:09:14 +02:00
heckflosse
8cad2f8863 CbDL badly interacts with Graduated and Vignetting Filter if CbDL is set to 'before Black-and-White', fixes #3473 2016-10-21 00:41:27 +02:00
frspp
e684bfaaa5 Update camconst.json
support for olympus omd e10 mk2 raw (was pink issue).
2016-10-20 00:57:35 +03:00
Flössie
ae98d4cb1f Revert rtengine/dcraw.cc 2016-10-18 18:18:25 +02:00
Flössie
730c03785d Reapplied clang-tidy filters
- modernize-use-nullptr
- modernize-redundant-void-arg
- readability-simplify-boolean-expr
- misc-redundant-expression
- readability-redundant-control-flow
- readability-avoid-const-params-in-decls
2016-10-18 18:16:05 +02:00
Flössie
0bbc84b2af Merge branch 'master' into clang-tidy 2016-10-18 17:48:50 +02:00
Flössie
f9f4fe9035 Revert rtengine/dcraw.cc 2016-10-18 17:12:50 +02:00
heckflosse
093fa46aa6 Updated dcraw.patch file 2016-10-17 22:20:33 +02:00
heckflosse
3d73eb45a1 Disabled unused functions in dcraw.cc .h 2016-10-17 21:47:52 +02:00
heckflosse
8df2df664f Cppcheck: some fixes 2016-10-17 18:49:15 +02:00
Morgan Hardwood
bb9c184af7 Merge branch 'master' into gtk3 2016-10-16 23:38:04 +02:00
Morgan Hardwood
4efae5c764 Merge branch 'master' into gtk3 2016-10-16 23:26:51 +02:00
heckflosse
ed42b1239c Merge cppckeck2 branch into master 2016-10-16 22:13:13 +02:00
Hombre
50165dab20 Merge branch 'master' into softproofing 2016-10-16 01:45:52 +02:00
heckflosse
81421db9c9 Cppcheck: some fixes 2016-10-13 22:15:33 +02:00
heckflosse
3625643392 Cppcheck: Fixed bug from last commit. Also added some new fixes 2016-10-13 17:37:08 +02:00
heckflosse
172ab63b85 Cppcheck: Fixed another bunch of warnings 2016-10-13 01:34:02 +02:00
Flössie
aeaff29ac0 Apply readability-simplify-boolean-expr 2016-10-12 20:01:30 +02:00
heckflosse
e98bd47487 Cppcheck: Fix some warnings 2016-10-12 19:04:06 +02:00