Review Request: Implement a lut docker that uses opencolorio to allow users to select luts, exposure and gamma for hdr images

Boudewijn Rempt boud at valdyas.org
Thu Jul 19 15:28:27 BST 2012


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/105266/
-----------------------------------------------------------

(Updated July 19, 2012, 2:28 p.m.)


Review request for Calligra.


Changes
-------

Updated to fix the icc-based color management path as well. Now rendering intent and blackpoint compensation (and other flags) can be passed even to KoColorSpace::bitBlt so the implicit conversion can be managed as well. This also fixes the color conversion dialog to allow users to select the blackpoint compensation flag and fixes the preferences dialog to update the canvas when the color management settings change.


Description
-------

Create a new docker with basically all the options of the Mari color management toolbar. It works both in CPU and in GPU mode, with the CPU mode being very slow, of course.

This adds a new optional dependency, OpenColorIO (which depends on OpenImageIO).


Diffs (updated)
-----

  cmake/modules/FindOCIO.cmake PRE-CREATION 
  cmake/modules/FindOIIO.cmake PRE-CREATION 
  krita/CMakeLists.txt 5aede20 
  krita/config-ocio.h.cmake PRE-CREATION 
  krita/config-oiio.h.cmake PRE-CREATION 
  krita/data/shaders/CMakeLists.txt 03ac39a 
  krita/data/shaders/hdr_exposure.frag 0917256 
  krita/image/kis_colorspace_convert_visitor.h 34b0ee5 
  krita/image/kis_colorspace_convert_visitor.cpp 70316a7 
  krita/image/kis_fixed_paint_device.h 33fbbc1 
  krita/image/kis_fixed_paint_device.cpp 1f2933f 
  krita/image/kis_group_layer.cc dd3773a 
  krita/image/kis_image.h 77b1669 
  krita/image/kis_image.cc 398b7f0 
  krita/image/kis_layer.cc 5f8d39c 
  krita/image/kis_mask.cc 4d56fec 
  krita/image/kis_paint_device.h f1725d3 
  krita/image/kis_paint_device.cc 607b687 
  krita/image/kis_painter.h 8ea7949 
  krita/image/kis_painter.cc 4ad9a37 
  krita/image/kis_pixel_selection.h 121beb6 
  krita/image/kis_pixel_selection.cpp 47edef1 
  krita/image/kis_selection_based_layer.cpp de39d43 
  krita/image/tests/kis_colorspace_convert_visitor_test.cpp db2aa14 
  krita/image/tests/kis_fixed_paint_device_test.cpp ea4b456 
  krita/image/tests/kis_image_test.cpp d9f2b95 
  krita/plugins/colorspaces/ctlcs/KoCtlColorConversionTransformation.h 93101c0 
  krita/plugins/colorspaces/ctlcs/KoCtlColorConversionTransformation.cpp 318043e 
  krita/plugins/colorspaces/ctlcs/KoCtlColorProfile.h 7fabffe 
  krita/plugins/colorspaces/ctlcs/KoCtlColorProfile.cpp 66897c2 
  krita/plugins/colorspaces/ctlcs/KoCtlColorSpace.cpp 6ba3707 
  krita/plugins/extensions/colorspaceconversion/colorspaceconversion.cc 3bb48a8 
  krita/plugins/extensions/colorspaceconversion/dlg_colorspaceconversion.cc 9c72e54 
  krita/plugins/extensions/colorspaceconversion/wdgconvertcolorspace.ui 8701468 
  krita/plugins/extensions/dockers/CMakeLists.txt 6f784dc 
  krita/plugins/extensions/dockers/advancedcolorselector/kis_common_colors.cpp c6467e4 
  krita/plugins/extensions/dockers/defaultdockers/CMakeLists.txt c11a39f 
  krita/plugins/extensions/dockers/defaultdockers/defaultdockers.cpp 7a0cbdb 
  krita/plugins/extensions/dockers/defaultdockers/kis_birdeye_box.h 142b2ab 
  krita/plugins/extensions/dockers/defaultdockers/kis_birdeye_box.cc c6f5492 
  krita/plugins/extensions/dockers/defaultdockers/wdgbirdeye.ui e10037a 
  krita/plugins/extensions/dockers/historydocker/KisUndoModel.cpp 256fb77 
  krita/plugins/extensions/dockers/lut/CMakeLists.txt PRE-CREATION 
  krita/plugins/extensions/dockers/lut/krita_lutdocker.desktop PRE-CREATION 
  krita/plugins/extensions/dockers/lut/lutdocker.h PRE-CREATION 
  krita/plugins/extensions/dockers/lut/lutdocker.cpp PRE-CREATION 
  krita/plugins/extensions/dockers/lut/lutdocker_dock.h PRE-CREATION 
  krita/plugins/extensions/dockers/lut/lutdocker_dock.cpp PRE-CREATION 
  krita/plugins/extensions/dockers/lut/ocio_display_filter.h PRE-CREATION 
  krita/plugins/extensions/dockers/lut/ocio_display_filter.cpp PRE-CREATION 
  krita/plugins/extensions/dockers/lut/wdglut.ui PRE-CREATION 
  krita/plugins/filters/fastcolortransfer/fastcolortransfer.cpp 4b79bcb 
  krita/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp 6fd7d8c 
  krita/plugins/filters/phongbumpmap/kis_phong_bumpmap_filter.cpp 0e60b93 
  krita/plugins/formats/CMakeLists.txt ea786da 
  krita/plugins/formats/bmp/CMakeLists.txt 93d7595 
  krita/plugins/formats/bmp/kis_bmp_export.cpp 5df7eac 
  krita/plugins/formats/jpeg/kis_jpeg_converter.cc 58afd38 
  krita/plugins/formats/oiio/CMakeLists.txt PRE-CREATION 
  krita/plugins/formats/oiio/kis_oiio_export.h PRE-CREATION 
  krita/plugins/formats/oiio/kis_oiio_export.cpp PRE-CREATION 
  krita/plugins/formats/oiio/kis_oiio_import.h PRE-CREATION 
  krita/plugins/formats/oiio/kis_oiio_import.cpp PRE-CREATION 
  krita/plugins/formats/oiio/krita_oiio.desktop PRE-CREATION 
  krita/plugins/formats/oiio/krita_oiio_export.desktop PRE-CREATION 
  krita/plugins/formats/oiio/krita_oiio_import.desktop PRE-CREATION 
  krita/plugins/formats/ppm/kis_ppm_export.cpp 7b146f1 
  krita/plugins/formats/tiff/kis_tiff_converter.cc ee99530 
  krita/plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp 15594d4 
  krita/plugins/paintops/defaultpaintops/duplicate/kis_duplicateop.cpp 92fcec1 
  krita/plugins/paintops/hatching/kis_hatching_paintop.cpp c104753 
  krita/plugins/paintops/libbrush/kis_auto_brush.cpp 8472314 
  krita/plugins/paintops/libbrush/kis_brush.cpp 049f431 
  krita/plugins/paintops/libbrush/kis_gbr_brush.cpp d164d18 
  krita/plugins/paintops/libbrush/tests/kis_auto_brush_test.cpp 6bf6b79 
  krita/plugins/paintops/libbrush/tests/kis_brush_test.cpp f02ac0b 
  krita/plugins/paintops/mypaint/mypaint_surface.cpp 1d84886 
  krita/plugins/tools/tool_transform2/kis_tool_transform.cc fa41229 
  krita/sdk/tests/filestest.h acba4da 
  krita/ui/CMakeLists.txt b002541 
  krita/ui/canvas/kis_canvas2.h aa410c4 
  krita/ui/canvas/kis_canvas2.cpp 6396b29 
  krita/ui/canvas/kis_display_filter.h PRE-CREATION 
  krita/ui/canvas/kis_display_filter.cpp PRE-CREATION 
  krita/ui/canvas/kis_image_pyramid.h 1dcef79 
  krita/ui/canvas/kis_image_pyramid.cpp 33ac3ab 
  krita/ui/canvas/kis_prescaled_projection.h 9e2caab 
  krita/ui/canvas/kis_prescaled_projection.cpp 8c2f043 
  krita/ui/canvas/kis_projection_backend.h b9aa38c 
  krita/ui/dialogs/kis_dlg_preferences.h 6193e7b 
  krita/ui/dialogs/kis_dlg_preferences.cc 3efcd21 
  krita/ui/forms/wdgcolorsettings.ui b7e3395 
  krita/ui/kis_bookmarked_filter_configurations_model.cc 777627b 
  krita/ui/kis_canvas_resource_provider.h 6bd5506 
  krita/ui/kis_canvas_resource_provider.cpp 8e104c6 
  krita/ui/kis_clipboard.cc 744c767 
  krita/ui/kis_config.h 8e717d5 
  krita/ui/kis_config.cc 238f06f 
  krita/ui/kis_custom_pattern.cc 722d43d 
  krita/ui/kis_exposure_visitor.h 8e53f58 
  krita/ui/kis_exposure_visitor.cc 8a64776 
  krita/ui/kis_filters_model.cc e1b6b76 
  krita/ui/kis_mimedata.cpp 63db3cc 
  krita/ui/kis_png_converter.cpp 232cb5e 
  krita/ui/kis_view2.cpp 438bc3a 
  krita/ui/opengl/kis_opengl_canvas2.cpp b874c29 
  krita/ui/opengl/kis_opengl_hdr_exposure_program.h 60b3fc4 
  krita/ui/opengl/kis_opengl_hdr_exposure_program.cpp 3b415e2 
  krita/ui/opengl/kis_opengl_image_textures.h ebe0759 
  krita/ui/opengl/kis_opengl_image_textures.cpp d4f282d 
  krita/ui/opengl/kis_texture_tile_update_info.h f100ec6 
  krita/ui/widgets/kis_scratch_pad.cpp ca368eb 
  libs/flake/KoOdfWorkaround.cpp d6aff39 
  libs/pigment/KoBasicHistogramProducers.cpp 14cee0b 
  libs/pigment/KoColor.cpp 5a70272 
  libs/pigment/KoColorConversionAlphaTransformation.h 2b17e68 
  libs/pigment/KoColorConversionAlphaTransformation.cpp 63f92c3 
  libs/pigment/KoColorConversionCache.h d2ecf64 
  libs/pigment/KoColorConversionCache.cpp 6a2d68c 
  libs/pigment/KoColorConversionSystem.h 8378d96 
  libs/pigment/KoColorConversionSystem.cpp aeb0975 
  libs/pigment/KoColorConversionTransformation.h 8d461d9 
  libs/pigment/KoColorConversionTransformation.cpp 0ab863f 
  libs/pigment/KoColorConversionTransformationAbstractFactory.h bddb253 
  libs/pigment/KoColorProfile.h 6835686 
  libs/pigment/KoColorProfile.cpp 5ca60a0 
  libs/pigment/KoColorSpace.h b61a211 
  libs/pigment/KoColorSpace.cpp c20a9a3 
  libs/pigment/KoColorSpaceAbstract.h bbcad8f 
  libs/pigment/KoCopyColorConversionTransformation.h b5db364 
  libs/pigment/KoCopyColorConversionTransformation.cpp 255f546 
  libs/pigment/KoFallBackColorTransformation.cpp f6ab183 
  libs/pigment/KoMultipleColorConversionTransformation.h 0c9580e 
  libs/pigment/KoMultipleColorConversionTransformation.cpp b94e205 
  libs/pigment/colorspaces/KoAlphaColorSpace.h ba70b17 
  libs/pigment/colorspaces/KoAlphaColorSpace.cpp 95bf868 
  libs/pigment/colorspaces/KoSimpleColorSpace.h 594f7c9 
  libs/pigment/colorspaces/KoSimpleColorSpaceEngine.h b9cadde 
  libs/pigment/colorspaces/KoSimpleColorSpaceEngine.cpp cd20cc1 
  plugins/colorengines/lcms2/IccColorSpaceEngine.h 5328e26 
  plugins/colorengines/lcms2/IccColorSpaceEngine.cpp ad9b3e5 
  plugins/colorengines/lcms2/tests/TestKoCompositeOps.cpp 22d7132 

Diff: http://git.reviewboard.kde.org/r/105266/diff/


Testing
-------


Thanks,

Boudewijn Rempt

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/calligra-devel/attachments/20120719/35cc9404/attachment.htm>


More information about the calligra-devel mailing list