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

Merge with 4e0f46f25a716ac65a4016bac6284685147b5ec9

Browse Source 
(note: color.cc is still in the source tree and CMakeLists.txt)
This commit is contained in:
michael
2012-07-09 06:28:15 -04:00
parent 5a7efbbbbb
commit 6b842fd408
35 changed files with 270 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rtengine/rtthumbnail.cc
View File

@@ -38,9 +38,6 @@
#include "jpeg.h"
#include "../rtgui/ppversion.h"
#define MAXVAL 0xffff
#define CLIP(a) ((a)>0?((a)<MAXVAL?(a):MAXVAL):0)
namespace rtengine {
Thumbnail* Thumbnail::loadFromImage (const Glib::ustring& fname, int &w, int &h, int fixwh, int deg) {
@@ -686,7 +683,7 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rhei
// perform color space transformation
if (isRaw)
RawImageSource::colorSpaceConversion16 (resImg, params.icm, embProfile, camProfile, cam2xyz, camName, logDefGain );
RawImageSource::colorSpaceConversion16 (resImg, params.icm, embProfile, camProfile, cam2xyz, camName );
else
StdImageSource::colorSpaceConversion16 (resImg, params.icm, embProfile);