~ubuntu-branches/ubuntu/vivid/luminance-hdr/vivid-proposed

« back to all changes in this revision

Viewing changes to src/HdrCreation/createhdr.cpp

Committer: Package Import Robot
Author(s): Andreas Metzler
Date: 2012-11-03 09:09:25 UTC
mfrom: (3.1.1 experimental)
Revision ID: package-import@ubuntu.com-20121103090925-6b12x4a4cpqd3u4q

Tags: 2.3.0-2

Upload to unstable.

files added:
.pc/.quilt_patches

.pc/.quilt_series

.pc/20_usrsharedoc.diff/CMakeGlobal.txt

cmake/FindGit.cmake

cmake/Findlcms2.cmake

cmake/Findlibjpeg.cmake

cmake/Findlibpng.cmake

help/en/color_management.html

help/en/images/color_management.png

help/en/images/prefs-cms.png

help/en/images/prefs-ext.png

help/en/images/prefs-hdr.png

help/en/images/prefs-raw.png

help/en/images/prefs-tm.png

help/en/prefs_cms.html

i18n-qt

i18n-qt/qt_cs.qm

i18n-qt/qt_de.qm

i18n-qt/qt_es.qm

i18n-qt/qt_fi.qm

i18n-qt/qt_fr.qm

i18n-qt/qt_hu.qm

i18n-qt/qt_it.qm

i18n-qt/qt_pl.qm

i18n-qt/qt_ro.qm

i18n-qt/qt_ru.qm

i18n-qt/qt_tr.qm

i18n-qt/qt_zh.qm

i18n/lang_hi.ts

i18n/lang_sk.ts

i18n/lang_zh.ts

images/CHIN0001.PNG

images/CZEC0001.PNG

images/FINL0001.PNG

images/FRAN0001.PNG

images/GERM0001.PNG

images/HUNG0001.PNG

images/INDA0001.PNG

images/INDN0001.PNG

images/ITAL0001.PNG

images/POLA0001.PNG

images/RMNA0001.PNG

images/RUSS0001.PNG

images/SPAN0001.PNG

images/SVKA0001.PNG

images/TURK0001.PNG

images/UNKG0001.PNG

images/camera-photo.png

images/cms.png

images/document-print-preview.png

images/gamut_48x48.png

images/printer.png

images/vcs_add.png

images/vcs_commit.png

images/vcs_update.png

images/video-television.png

src/Common/FloatRgbToQRgb.cpp

src/Common/FloatRgbToQRgb.h

src/Common/ResourceHandler.h

src/Common/ResourceHandlerCommon.h

src/Common/ResourceHandlerLcms.h

src/Common/SavedParametersDialog.cpp

src/Common/SavedParametersDialog.h

src/Common/SavedParametersDialog.ui

src/Fileformat/jpegreader.cpp

src/Fileformat/jpegreader.h

src/Fileformat/jpegwriter.cpp

src/Fileformat/jpegwriter.h

src/Fileformat/pfsouthdrimage.cpp

src/Fileformat/pfsouthdrimage.h

src/Fileformat/pngwriter.cpp

src/Fileformat/pngwriter.h

src/HelpBrowser/help-path.hxx.in

src/MainCli/ezETAProgressBar.hpp

src/OsIntegration

src/OsIntegration/CMakeLists.txt

src/OsIntegration/ecwin7.cpp

src/OsIntegration/ecwin7.h

src/OsIntegration/osintegration.cpp

src/OsIntegration/osintegration.h

src/TonemappingOperators/fattal02/pde_fft.cpp

files removed:
.pc/20_usrsharedoc.diff/src

.pc/20_usrsharedoc.diff/src/HelpBrowser

.pc/20_usrsharedoc.diff/src/HelpBrowser/LuminancePaths.cpp

.pc/30_fix_building_non_x86

.pc/30_fix_building_non_x86/src

.pc/30_fix_building_non_x86/src/arch

.pc/30_fix_building_non_x86/src/arch/malloc.h

debian/patches/30_fix_building_non_x86

src/TonemappingPanel/SavedParametersDialog.cpp

src/TonemappingPanel/SavedParametersDialog.h

src/TonemappingPanel/SavedParametersDialog.ui

src/TonemappingPanel/TonemappingWarnDialog.ui

files modified:
.pc/10_remove_encoding_from_desktop_file/luminance-hdr.desktop

.pc/20_usrsharedoc.diff/CMakeLists.txt

.pc/applied-patches

CMakeGlobal.txt

CMakeLists.txt

Changelog

build/msvc/build.cmd

build/msvc/setenv.cmd

cmake/FindLibRAW.cmake

cmake/Findfftwf.cmake

debian/changelog

debian/control

debian/copyright

debian/patches/20_usrsharedoc.diff

debian/patches/series

help/en/basics.html

help/en/features.html

help/en/images/batch-hdr.png

help/en/images/batch-tmo.png

help/en/images/cropping_frame.png

help/en/images/mainwin.png

help/en/images/preferences.png

help/en/menu.xml

help/en/news.html

help/en/prefs.html

help/en/prefs_hdr.html

help/en/prefs_rawconversion.html

help/en/prefs_tonemapping.html

help/en/prefs_tools.html

i18n/lang_cs.ts

i18n/lang_de.ts

i18n/lang_es.ts

i18n/lang_fi.ts

i18n/lang_fr.ts

i18n/lang_hu.ts

i18n/lang_id.ts

i18n/lang_it.ts

i18n/lang_pl.ts

i18n/lang_ro.ts

i18n/lang_ru.ts

i18n/lang_tr.ts

icons.qrc

images/luminance_ico.rc

luminance-hdr.desktop

src/BatchHDR/BatchHDRDialog.cpp

src/BatchHDR/BatchHDRDialog.h

src/BatchHDR/BatchHDRDialog.ui

src/BatchTM/BatchTMDialog.cpp

src/BatchTM/BatchTMDialog.h

src/BatchTM/BatchTMDialog.ui

src/BatchTM/BatchTMJob.cpp

src/BatchTM/BatchTMJob.h

src/CMakeLists.txt

src/Common/CMakeLists.txt

src/Common/LuminanceOptions.cpp

src/Common/LuminanceOptions.h

src/Common/config.h

src/Common/global.cpp

src/Common/global.h

src/Common/msec_timer.h

src/Core/IOWorker.cpp

src/Core/IOWorker.h

src/Core/TMWorker.h

src/Core/TonemappingOptions.cpp

src/Core/TonemappingOptions.h

src/Exif/ExifOperations.cpp

src/Exif/ExifOperations.h

src/Fileformat/CMakeLists.txt

src/Fileformat/pfs_file_format.h

src/Fileformat/pfsinraw.cpp

src/Fileformat/pfsout16bitspixmap.cpp

src/Fileformat/pfsout16bitspixmap.h

src/Fileformat/pfsoutldrimage.cpp

src/Fileformat/pfsoutldrimage.h

src/Fileformat/pfstiff.cpp

src/Fileformat/pfstiff.h

src/Filter/pfsgamma.h

src/Filter/pfsgammaandlevels.cpp

src/Filter/pfsgammaandlevels.h

src/Filter/pfsrotate.h

src/Filter/pfssize.cpp

src/Filter/pfssize.h

src/HdrCreation/HdrCreationManager.cpp

src/HdrCreation/HdrCreationManager.h

src/HdrCreation/createhdr.cpp

src/HdrCreation/mtb_alignment.cpp

src/HdrCreation/mtb_alignment.h

src/HdrCreation/responses.cpp

src/HdrCreation/responses.h

src/HdrCreation/robertson02.h

src/HdrWizard/EditingTools.cpp

src/HdrWizard/EditingTools.h

src/HdrWizard/EditingTools.ui

src/HdrWizard/HdrWizard.cpp

src/HdrWizard/HdrWizard.h

src/HdrWizard/HdrWizard.ui

src/HdrWizard/PreviewWidget.cpp

src/HdrWizard/PreviewWidget.h

src/HelpBrowser/CMakeLists.txt

src/HelpBrowser/HelpBrowser.ui

src/HelpBrowser/HelpSideBar.ui

src/HelpBrowser/LuminancePaths.cpp

src/Libpfs/array2d.cpp

src/Libpfs/array2d.h

src/Libpfs/channel.cpp

src/Libpfs/channel.h

src/Libpfs/colorspace.h

src/Libpfs/domio.h

src/Libpfs/frame.h

src/Libpfs/tag.h

src/Libpfs/vex.cpp

src/Libpfs/vex.h

src/MainCli/CMakeLists.txt

src/MainCli/commandline.cpp

src/MainCli/commandline.h

src/MainGui/main.cpp

src/MainWindow/DnDOption.cpp

src/MainWindow/DnDOption.h

src/MainWindow/DnDOption.ui

src/MainWindow/MainWindow.cpp

src/MainWindow/MainWindow.h

src/MainWindow/MainWindow.ui

src/MainWindow/Splash.ui

src/Preferences/PreferencesDialog.cpp

src/Preferences/PreferencesDialog.h

src/Preferences/PreferencesDialog.ui

src/PreviewPanel/PreviewPanel.ui

src/Resize/ResizeDialog.ui

src/Threads/HdrInputLoader.cpp

src/TonemappingEngine/TonemapOperatorFattal02.cpp

src/TonemappingEngine/TonemapOperatorFattal02.h

src/TonemappingEngine/TonemapOperatorReinhard02.cpp

src/TonemappingEngine/TonemapOperatorReinhard02.h

src/TonemappingOperators/ashikhmin02/pfstmo_ashikhmin02.cpp

src/TonemappingOperators/ashikhmin02/tmo_ashikhmin02.cpp

src/TonemappingOperators/ashikhmin02/tmo_ashikhmin02.h

src/TonemappingOperators/drago03/pfstmo_drago03.cpp

src/TonemappingOperators/drago03/tmo_drago03.cpp

src/TonemappingOperators/drago03/tmo_drago03.h

src/TonemappingOperators/durand02/bilateral.cpp

src/TonemappingOperators/durand02/bilateral.h

src/TonemappingOperators/durand02/fastbilateral.cpp

src/TonemappingOperators/durand02/fastbilateral.h

src/TonemappingOperators/durand02/tmo_durand02.cpp

src/TonemappingOperators/durand02/tmo_durand02.h

src/TonemappingOperators/fattal02/pde.cpp

src/TonemappingOperators/fattal02/pde.h

src/TonemappingOperators/fattal02/pfstmo_fattal02.cpp

src/TonemappingOperators/fattal02/tmo_fattal02.cpp

src/TonemappingOperators/fattal02/tmo_fattal02.h

src/TonemappingOperators/mantiuk06/contrast_domain.cpp

src/TonemappingOperators/mantiuk08/display_adaptive_tmo.cpp

src/TonemappingOperators/mantiuk08/display_function.cpp

src/TonemappingOperators/mantiuk08/display_function.h

src/TonemappingOperators/pattanaik00/pfstmo_pattanaik00.cpp

src/TonemappingOperators/pattanaik00/tmo_pattanaik00.cpp

src/TonemappingOperators/pattanaik00/tmo_pattanaik00.h

src/TonemappingOperators/pfstmdefaultparams.h

src/TonemappingOperators/pfstmo.h

src/TonemappingOperators/reinhard02/pfstmo_reinhard02.cpp

src/TonemappingOperators/reinhard02/tmo_reinhard02.cpp

src/TonemappingOperators/reinhard02/tmo_reinhard02.h

src/TonemappingOperators/reinhard05/pfstmo_reinhard05.cpp

src/TonemappingOperators/reinhard05/tmo_reinhard05.cpp

src/TonemappingOperators/reinhard05/tmo_reinhard05.h

src/TonemappingPanel/CMakeLists.txt

src/TonemappingPanel/TMOProgressIndicator.cpp

src/TonemappingPanel/TonemappingPanel.cpp

src/TonemappingPanel/TonemappingPanel.h

src/TonemappingPanel/TonemappingPanel.ui

src/TonemappingPanel/TonemappingWarnDialog.cpp

src/TonemappingPanel/TonemappingWarnDialog.h

src/TransplantExif/TransplantExifDialog.ui

src/UI/GammaAndLevels.cpp

src/UI/GammaAndLevels.ui

src/UI/ImageQualityDialog.cpp

src/UI/ImageQualityDialog.ui

src/UI/UMessageBox.cpp

src/UI/UMessageBox.h

src/UI/about.ui

src/Viewers/GenericViewer.cpp

src/Viewers/GenericViewer.h

src/Viewers/HdrViewer.cpp

src/Viewers/HdrViewer.h

src/Viewers/IGraphicsPixmapItem.cpp

src/Viewers/IGraphicsPixmapItem.h

src/Viewers/IGraphicsView.cpp

src/Viewers/LdrViewer.cpp

src/Viewers/LdrViewer.h

src/arch/minmax.h

src/arch/msvc/math.h

src/arch/string.h

Show diffs side-by-side

added added

removed removed

src/HdrCreation/createhdr.cpp

192

{

193

FILE* respfile = fopen(QFile::encodeName(chosen_config->LoadCurveFromFilename).constData(),"r");

194

// read camera response from file

195

bool loadR_ok = responseLoad(respfile, Ir.data(), M);

196

bool loadG_ok = responseLoad(respfile, Ig.data(), M);

197

bool loadB_ok = responseLoad(respfile, Ib.data(), M);

195

bool load_ok = responseLoad(respfile, Ir.data(), Ig.data(), Ib.data(), M);

198

196

fclose(respfile);

199

197

200

if ( !loadR_ok || !loadG_ok || !loadB_ok )

198

if ( !load_ok)

201

199

{

202

200

responseGamma(Ir.data(), M);

203

201

responseGamma(Ig.data(), M);

237

235

break;

238

236

}

239

237

238

//save response curves if required (variable not empty)

239

if (chosen_config->SaveCurveToFilename != "") {

240

FILE * respfile=fopen(QFile::encodeName(chosen_config->SaveCurveToFilename).constData(), "w");

241

responseSave(respfile, Ir.data(), Ig.data(), Ib.data(), M);

242

fclose(respfile);

243

}

244

240

245

//3) apply model to generate hdr.

241

246

switch ( opt_model )

242

247

{

Older »