~ubuntu-branches/ubuntu/saucy/darktable/saucy

« back to all changes in this revision

Viewing changes to src/iop/gamma.c

Committer: Bazaar Package Importer
Author(s): David Bremner
Date: 2011-08-02 21:32:31 UTC
mfrom: (1.1.2 upstream)
Revision ID: james.westby@ubuntu.com-20110802213231-r9v63trgyk1e822j

Tags: 0.9.1-1

New upstream release

files added:
src/external/LibRaw

src/external/LibRaw/CMakeLists.txt

src/external/LibRaw/dcraw

src/external/LibRaw/dcraw/dcraw.c

src/external/LibRaw/internal

src/external/LibRaw/internal/dcb_demosaicing.c

src/external/LibRaw/internal/dcraw_common.cpp

src/external/LibRaw/internal/dcraw_fileio.cpp

src/external/LibRaw/internal/defines.h

src/external/LibRaw/internal/demosaic_packs.cpp

src/external/LibRaw/internal/libraw_internal_funcs.h

src/external/LibRaw/internal/var_defines.h

src/external/LibRaw/libraw

src/external/LibRaw/libraw/libraw.h

src/external/LibRaw/libraw/libraw_alloc.h

src/external/LibRaw/libraw/libraw_const.h

src/external/LibRaw/libraw/libraw_datastream.h

src/external/LibRaw/libraw/libraw_internal.h

src/external/LibRaw/libraw/libraw_types.h

src/external/LibRaw/libraw/libraw_version.h

src/external/LibRaw/src

src/external/LibRaw/src/libraw_c_api.cpp

src/external/LibRaw/src/libraw_cxx.cpp

src/external/OpenCL

src/external/OpenCL/cl_platform.h

src/external/rawspeed

src/external/rawspeed/CMakeLists.txt

src/external/rawspeed/RawSpeed

src/external/rawspeed/RawSpeed/ArwDecoder.cpp

src/external/rawspeed/RawSpeed/ArwDecoder.h

src/external/rawspeed/RawSpeed/BitPumpJPEG.cpp

src/external/rawspeed/RawSpeed/BitPumpJPEG.h

src/external/rawspeed/RawSpeed/BitPumpMSB.cpp

src/external/rawspeed/RawSpeed/BitPumpMSB.h

src/external/rawspeed/RawSpeed/BitPumpMSB32.cpp

src/external/rawspeed/RawSpeed/BitPumpMSB32.h

src/external/rawspeed/RawSpeed/BitPumpPlain.cpp

src/external/rawspeed/RawSpeed/BitPumpPlain.h

src/external/rawspeed/RawSpeed/BlackArea.cpp

src/external/rawspeed/RawSpeed/BlackArea.h

src/external/rawspeed/RawSpeed/ByteStream.cpp

src/external/rawspeed/RawSpeed/ByteStream.h

src/external/rawspeed/RawSpeed/ByteStreamSwap.cpp

src/external/rawspeed/RawSpeed/ByteStreamSwap.h

src/external/rawspeed/RawSpeed/Camera.cpp

src/external/rawspeed/RawSpeed/Camera.h

src/external/rawspeed/RawSpeed/CameraMetaData.cpp

src/external/rawspeed/RawSpeed/CameraMetaData.h

src/external/rawspeed/RawSpeed/CameraMetadataException.cpp

src/external/rawspeed/RawSpeed/CameraMetadataException.h

src/external/rawspeed/RawSpeed/ColorFilterArray.cpp

src/external/rawspeed/RawSpeed/ColorFilterArray.h

src/external/rawspeed/RawSpeed/Common.cpp

src/external/rawspeed/RawSpeed/Common.h

src/external/rawspeed/RawSpeed/Cr2Decoder.cpp

src/external/rawspeed/RawSpeed/Cr2Decoder.h

src/external/rawspeed/RawSpeed/DngDecoder.cpp

src/external/rawspeed/RawSpeed/DngDecoder.h

src/external/rawspeed/RawSpeed/DngDecoderSlices.cpp

src/external/rawspeed/RawSpeed/DngDecoderSlices.h

src/external/rawspeed/RawSpeed/FileIOException.cpp

src/external/rawspeed/RawSpeed/FileIOException.h

src/external/rawspeed/RawSpeed/FileMap.cpp

src/external/rawspeed/RawSpeed/FileMap.h

src/external/rawspeed/RawSpeed/FileReader.cpp

src/external/rawspeed/RawSpeed/FileReader.h

src/external/rawspeed/RawSpeed/IOException.cpp

src/external/rawspeed/RawSpeed/IOException.h

src/external/rawspeed/RawSpeed/LJpegDecompressor.cpp

src/external/rawspeed/RawSpeed/LJpegDecompressor.h

src/external/rawspeed/RawSpeed/LJpegPlain.cpp

src/external/rawspeed/RawSpeed/LJpegPlain.h

src/external/rawspeed/RawSpeed/NefDecoder.cpp

src/external/rawspeed/RawSpeed/NefDecoder.h

src/external/rawspeed/RawSpeed/NikonDecompressor.cpp

src/external/rawspeed/RawSpeed/NikonDecompressor.h

src/external/rawspeed/RawSpeed/OrfDecoder.cpp

src/external/rawspeed/RawSpeed/OrfDecoder.h

src/external/rawspeed/RawSpeed/PefDecoder.cpp

src/external/rawspeed/RawSpeed/PefDecoder.h

src/external/rawspeed/RawSpeed/PentaxDecompressor.cpp

src/external/rawspeed/RawSpeed/PentaxDecompressor.h

src/external/rawspeed/RawSpeed/Point.h

src/external/rawspeed/RawSpeed/RawDecoder.cpp

src/external/rawspeed/RawSpeed/RawDecoder.h

src/external/rawspeed/RawSpeed/RawDecoderException.cpp

src/external/rawspeed/RawSpeed/RawDecoderException.h

src/external/rawspeed/RawSpeed/RawImage.cpp

src/external/rawspeed/RawSpeed/RawImage.h

src/external/rawspeed/RawSpeed/RawImageDataFloat.cpp

src/external/rawspeed/RawSpeed/RawImageDataU16.cpp

src/external/rawspeed/RawSpeed/RawSpeed.cpp

src/external/rawspeed/RawSpeed/Rw2Decoder.cpp

src/external/rawspeed/RawSpeed/Rw2Decoder.h

src/external/rawspeed/RawSpeed/SrwDecoder.cpp

src/external/rawspeed/RawSpeed/SrwDecoder.h

src/external/rawspeed/RawSpeed/StdAfx.cpp

src/external/rawspeed/RawSpeed/StdAfx.h

src/external/rawspeed/RawSpeed/TiffEntry.cpp

src/external/rawspeed/RawSpeed/TiffEntry.h

src/external/rawspeed/RawSpeed/TiffEntryBE.cpp

src/external/rawspeed/RawSpeed/TiffEntryBE.h

src/external/rawspeed/RawSpeed/TiffIFD.cpp

src/external/rawspeed/RawSpeed/TiffIFD.h

src/external/rawspeed/RawSpeed/TiffIFDBE.cpp

src/external/rawspeed/RawSpeed/TiffIFDBE.h

src/external/rawspeed/RawSpeed/TiffParser.cpp

src/external/rawspeed/RawSpeed/TiffParser.h

src/external/rawspeed/RawSpeed/TiffParserException.cpp

src/external/rawspeed/RawSpeed/TiffParserException.h

src/external/rawspeed/RawSpeed/TiffParserHeaderless.cpp

src/external/rawspeed/RawSpeed/TiffParserHeaderless.h

src/external/rawspeed/RawSpeed/TiffParserOlympus.cpp

src/external/rawspeed/RawSpeed/TiffParserOlympus.h

src/external/rawspeed/RawSpeed/TiffTag.h

src/external/rawspeed/copying.txt

src/external/rawspeed/credits.txt

src/external/rawspeed/data

src/external/rawspeed/data/cameras.xml

src/external/rawspeed/data/showcameras.xsl

src/external/rawspeed/update_rawspeed.sh

tools/create_accel_strings.sh

tools/keybinding2docbook.awk

tools/keybinding2docbook.sh

files removed:
src/LibRaw

src/LibRaw/CMakeLists.txt

src/LibRaw/dcraw

src/LibRaw/dcraw/dcraw.c

src/LibRaw/internal

src/LibRaw/internal/dcb_demosaicing.c

src/LibRaw/internal/dcraw_common.cpp

src/LibRaw/internal/dcraw_fileio.cpp

src/LibRaw/internal/defines.h

src/LibRaw/internal/demosaic_packs.cpp

src/LibRaw/internal/libraw_internal_funcs.h

src/LibRaw/internal/var_defines.h

src/LibRaw/libraw

src/LibRaw/libraw/libraw.h

src/LibRaw/libraw/libraw_alloc.h

src/LibRaw/libraw/libraw_const.h

src/LibRaw/libraw/libraw_datastream.h

src/LibRaw/libraw/libraw_internal.h

src/LibRaw/libraw/libraw_types.h

src/LibRaw/libraw/libraw_version.h

src/LibRaw/src

src/LibRaw/src/libraw_c_api.cpp

src/LibRaw/src/libraw_cxx.cpp

src/rawspeed

src/rawspeed/CMakeLists.txt

src/rawspeed/RawSpeed

src/rawspeed/RawSpeed/ArwDecoder.cpp

src/rawspeed/RawSpeed/ArwDecoder.h

src/rawspeed/RawSpeed/BitPumpJPEG.cpp

src/rawspeed/RawSpeed/BitPumpJPEG.h

src/rawspeed/RawSpeed/BitPumpMSB.cpp

src/rawspeed/RawSpeed/BitPumpMSB.h

src/rawspeed/RawSpeed/BitPumpMSB32.cpp

src/rawspeed/RawSpeed/BitPumpMSB32.h

src/rawspeed/RawSpeed/BitPumpPlain.cpp

src/rawspeed/RawSpeed/BitPumpPlain.h

src/rawspeed/RawSpeed/BlackArea.cpp

src/rawspeed/RawSpeed/BlackArea.h

src/rawspeed/RawSpeed/ByteStream.cpp

src/rawspeed/RawSpeed/ByteStream.h

src/rawspeed/RawSpeed/ByteStreamSwap.cpp

src/rawspeed/RawSpeed/ByteStreamSwap.h

src/rawspeed/RawSpeed/Camera.cpp

src/rawspeed/RawSpeed/Camera.h

src/rawspeed/RawSpeed/CameraMetaData.cpp

src/rawspeed/RawSpeed/CameraMetaData.h

src/rawspeed/RawSpeed/CameraMetadataException.cpp

src/rawspeed/RawSpeed/CameraMetadataException.h

src/rawspeed/RawSpeed/ColorFilterArray.cpp

src/rawspeed/RawSpeed/ColorFilterArray.h

src/rawspeed/RawSpeed/Common.cpp

src/rawspeed/RawSpeed/Common.h

src/rawspeed/RawSpeed/Cr2Decoder.cpp

src/rawspeed/RawSpeed/Cr2Decoder.h

src/rawspeed/RawSpeed/DngDecoder.cpp

src/rawspeed/RawSpeed/DngDecoder.h

src/rawspeed/RawSpeed/DngDecoderSlices.cpp

src/rawspeed/RawSpeed/DngDecoderSlices.h

src/rawspeed/RawSpeed/FileIOException.cpp

src/rawspeed/RawSpeed/FileIOException.h

src/rawspeed/RawSpeed/FileMap.cpp

src/rawspeed/RawSpeed/FileMap.h

src/rawspeed/RawSpeed/FileReader.cpp

src/rawspeed/RawSpeed/FileReader.h

src/rawspeed/RawSpeed/IOException.cpp

src/rawspeed/RawSpeed/IOException.h

src/rawspeed/RawSpeed/LJpegDecompressor.cpp

src/rawspeed/RawSpeed/LJpegDecompressor.h

src/rawspeed/RawSpeed/LJpegPlain.cpp

src/rawspeed/RawSpeed/LJpegPlain.h

src/rawspeed/RawSpeed/NefDecoder.cpp

src/rawspeed/RawSpeed/NefDecoder.h

src/rawspeed/RawSpeed/NikonDecompressor.cpp

src/rawspeed/RawSpeed/NikonDecompressor.h

src/rawspeed/RawSpeed/OrfDecoder.cpp

src/rawspeed/RawSpeed/OrfDecoder.h

src/rawspeed/RawSpeed/PefDecoder.cpp

src/rawspeed/RawSpeed/PefDecoder.h

src/rawspeed/RawSpeed/PentaxDecompressor.cpp

src/rawspeed/RawSpeed/PentaxDecompressor.h

src/rawspeed/RawSpeed/Point.h

src/rawspeed/RawSpeed/RawDecoder.cpp

src/rawspeed/RawSpeed/RawDecoder.h

src/rawspeed/RawSpeed/RawDecoderException.cpp

src/rawspeed/RawSpeed/RawDecoderException.h

src/rawspeed/RawSpeed/RawImage.cpp

src/rawspeed/RawSpeed/RawImage.h

src/rawspeed/RawSpeed/RawImageDataFloat.cpp

src/rawspeed/RawSpeed/RawImageDataU16.cpp

src/rawspeed/RawSpeed/RawSpeed.cpp

src/rawspeed/RawSpeed/Rw2Decoder.cpp

src/rawspeed/RawSpeed/Rw2Decoder.h

src/rawspeed/RawSpeed/SrwDecoder.cpp

src/rawspeed/RawSpeed/SrwDecoder.h

src/rawspeed/RawSpeed/StdAfx.cpp

src/rawspeed/RawSpeed/StdAfx.h

src/rawspeed/RawSpeed/TiffEntry.cpp

src/rawspeed/RawSpeed/TiffEntry.h

src/rawspeed/RawSpeed/TiffEntryBE.cpp

src/rawspeed/RawSpeed/TiffEntryBE.h

src/rawspeed/RawSpeed/TiffIFD.cpp

src/rawspeed/RawSpeed/TiffIFD.h

src/rawspeed/RawSpeed/TiffIFDBE.cpp

src/rawspeed/RawSpeed/TiffIFDBE.h

src/rawspeed/RawSpeed/TiffParser.cpp

src/rawspeed/RawSpeed/TiffParser.h

src/rawspeed/RawSpeed/TiffParserException.cpp

src/rawspeed/RawSpeed/TiffParserException.h

src/rawspeed/RawSpeed/TiffParserHeaderless.cpp

src/rawspeed/RawSpeed/TiffParserHeaderless.h

src/rawspeed/RawSpeed/TiffParserOlympus.cpp

src/rawspeed/RawSpeed/TiffParserOlympus.h

src/rawspeed/RawSpeed/TiffTag.h

src/rawspeed/copying.txt

src/rawspeed/credits.txt

src/rawspeed/data

src/rawspeed/data/cameras.xml

src/rawspeed/data/showcameras.xsl

src/rawspeed/update_rawspeed.sh

files modified:
.pc/0001-Add-Wno-error-unused-but-set-variable.patch/src/CMakeLists.txt

cmake/version.cmake

data/darktable-faster

data/kernels/basic.cl

debian/changelog

debian/copyright

debian/patches/0001-Add-Wno-error-unused-but-set-variable.patch

po/POTFILES.in

po/cs.po

po/de.po

po/es.po

po/nl.po

po/ru.po

po/sv.po

src/CMakeLists.txt

src/common/colorlabels.c

src/common/colorlabels.h

src/common/colorspaces.c

src/common/darktable.c

src/common/darktable.h

src/common/debug.h

src/common/dlopencl.c

src/common/dynload.c

src/common/exif.cc

src/common/history.c

src/common/image.c

src/common/image.h

src/common/image_cache.c

src/common/imageio.c

src/common/opencl.c

src/common/opencl.h

src/common/tags.c

src/control/control.c

src/control/control.h

src/control/jobs/control_jobs.c

src/develop/blend.c

src/develop/develop.c

src/develop/develop.h

src/develop/imageop.c

src/develop/imageop.h

src/develop/pixelpipe_hb.c

src/develop/pixelpipe_hb.h

src/dtgtk/button.c

src/dtgtk/button.h

src/dtgtk/slider.c

src/dtgtk/slider.h

src/dtview/main.c

src/external/adobe_coeff.c

src/external/dcraw.c

src/gui/camera_import_dialog.c

src/gui/gtk.c

src/gui/gtk.h

src/gui/iop_history.c

src/gui/preferences.c

src/gui/tool_colorlabels.c

src/imageio/storage/flickr.c

src/imageio/storage/picasa.c

src/iop/anlfyeni.c

src/iop/atrous.c

src/iop/basecurve.c

src/iop/bloom.c

src/iop/borders.c

src/iop/channelmixer.c

src/iop/clipping.c

src/iop/colorcorrection.c

src/iop/colorin.c

src/iop/colorin.h

src/iop/colorout.c

src/iop/colorout.h

src/iop/demosaic.c

src/iop/exposure.c

src/iop/gamma.c

src/iop/graduatednd.c

src/iop/grain.c

src/iop/highlights.c

src/iop/highpass.c

src/iop/hotpixels.c

src/iop/lens.c

src/iop/localc.c

src/iop/lowlight.c

src/iop/nlmeans.c

src/iop/sharpen.c

src/iop/splittoning.c

src/iop/temperature.c

src/iop/tonecurve.c

src/iop/tonecurve.h

src/iop/tonemap.cc

src/iop/vignette.c

src/iop/watermark.c

src/iop/wb_presets.c

src/libs/copy_history.c

src/libs/export.c

src/libs/image.c

src/libs/lib.c

src/libs/lib.h

src/libs/select.c

src/libs/styles.c

src/views/capture.c

src/views/darkroom.c

src/views/filmstrip.c

src/views/lighttable.c

src/views/view.c

src/views/view.h

tools/iop_dependencies.py

Show diffs side-by-side

added added

removed removed

src/iop/gamma.c

}

void init_key_accels()

{

dtgtk_slider_init_accel(darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/gamma/linear");

dtgtk_slider_init_accel(darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/gamma/gamma");

}

void process (struct dt_iop_module_t *self, dt_dev_pixelpipe_iop_t *piece, void *i, void *o, const dt_iop_roi_t *roi_in, const dt_iop_roi_t *roi_out)

176

181

gtk_box_pack_start(GTK_BOX(g->vbox1), GTK_WIDGET(g->label2), TRUE, TRUE, 0);

177

182

g->scale1 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR,0.0, 1.0, 0.01,p->linear,2));

178

183

g->scale2 = DTGTK_SLIDER(dtgtk_slider_new_with_range(DARKTABLE_SLIDER_BAR,0.0, 1.0, 0.01,p->gamma,2));

184

dtgtk_slider_set_accel(g->scale1,darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/gamma/linear");

185

dtgtk_slider_set_accel(g->scale2,darktable.control->accels_darkroom,"<Darktable>/darkroom/plugins/gamma/gamma");

179

186

gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale1), TRUE, TRUE, 0);

180

187

gtk_box_pack_start(GTK_BOX(g->vbox2), GTK_WIDGET(g->scale2), TRUE, TRUE, 0);

181

188

Older »