Browse Source

rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 9 years ago
parent
commit
04766b207a
2299 changed files with 10010 additions and 10010 deletions
  1. +3
    -3
      chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
  2. +3
    -3
      chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h
  3. +32
    -32
      chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
  4. +16
    -16
      chalk/chalkcolor/colorspaces/kis_lab_colorspace.h
  5. +39
    -39
      chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
  6. +11
    -11
      chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h
  7. +2
    -2
      chalk/chalkcolor/kis_abstract_colorspace.cc
  8. +8
    -8
      chalk/chalkcolor/kis_abstract_colorspace.h
  9. +3
    -3
      chalk/chalkcolor/kis_colorspace.h
  10. +3
    -3
      chalk/chalkcolor/kis_colorspace_iface.cc
  11. +1
    -1
      chalk/chalkcolor/kis_colorspace_iface.h
  12. +2
    -2
      chalk/chalkcolor/kis_f16half_base_colorspace.h
  13. +2
    -2
      chalk/chalkcolor/kis_f32_base_colorspace.h
  14. +2
    -2
      chalk/chalkcolor/kis_u16_base_colorspace.h
  15. +2
    -2
      chalk/chalkcolor/kis_u8_base_colorspace.h
  16. +4
    -4
      chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc
  17. +1
    -1
      chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h
  18. +39
    -39
      chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
  19. +12
    -12
      chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h
  20. +4
    -4
      chalk/colorspaces/cmyk_u8/cmyk_plugin.cc
  21. +1
    -1
      chalk/colorspaces/cmyk_u8/cmyk_plugin.h
  22. +39
    -39
      chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
  23. +12
    -12
      chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.h
  24. +4
    -4
      chalk/colorspaces/gray_u16/gray_u16_plugin.cc
  25. +1
    -1
      chalk/colorspaces/gray_u16/gray_u16_plugin.h
  26. +39
    -39
      chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
  27. +12
    -12
      chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.h
  28. +4
    -4
      chalk/colorspaces/gray_u8/gray_plugin.cc
  29. +1
    -1
      chalk/colorspaces/gray_u8/gray_plugin.h
  30. +81
    -81
      chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
  31. +13
    -13
      chalk/colorspaces/gray_u8/kis_gray_colorspace.h
  32. +20
    -20
      chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
  33. +5
    -5
      chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h
  34. +4
    -4
      chalk/colorspaces/lms_f32/lms_f32_plugin.cc
  35. +1
    -1
      chalk/colorspaces/lms_f32/lms_f32_plugin.h
  36. +39
    -39
      chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
  37. +16
    -16
      chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
  38. +4
    -4
      chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cc
  39. +1
    -1
      chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.h
  40. +1
    -1
      chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc
  41. +39
    -39
      chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
  42. +16
    -16
      chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
  43. +4
    -4
      chalk/colorspaces/rgb_f32/rgb_f32_plugin.cc
  44. +1
    -1
      chalk/colorspaces/rgb_f32/rgb_f32_plugin.h
  45. +1
    -1
      chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc
  46. +39
    -39
      chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
  47. +16
    -16
      chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h
  48. +4
    -4
      chalk/colorspaces/rgb_u16/rgb_u16_plugin.cc
  49. +1
    -1
      chalk/colorspaces/rgb_u16/rgb_u16_plugin.h
  50. +1
    -1
      chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc
  51. +109
    -109
      chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
  52. +17
    -17
      chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h
  53. +4
    -4
      chalk/colorspaces/rgb_u8/rgb_plugin.cc
  54. +1
    -1
      chalk/colorspaces/rgb_u8/rgb_plugin.h
  55. +2
    -2
      chalk/colorspaces/wet/kis_wet_colorspace.cc
  56. +2
    -2
      chalk/colorspaces/wet/kis_wet_colorspace.h
  57. +1
    -1
      chalk/colorspaces/wet/kis_wet_palette_widget.cc
  58. +1
    -1
      chalk/colorspaces/wet/kis_wet_palette_widget.h
  59. +7
    -7
      chalk/colorspaces/wet/kis_wetop.cc
  60. +2
    -2
      chalk/colorspaces/wet/kis_wetop.h
  61. +6
    -6
      chalk/colorspaces/wet/wet_plugin.cc
  62. +1
    -1
      chalk/colorspaces/wet/wet_plugin.h
  63. +2
    -2
      chalk/colorspaces/wet/wetphysicsfilter.cc
  64. +7
    -7
      chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc
  65. +3
    -3
      chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc
  66. +1
    -1
      chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.h
  67. +10
    -10
      chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
  68. +3
    -3
      chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.h
  69. +2
    -2
      chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc
  70. +1
    -1
      chalk/colorspaces/wetsticky/kis_ws_engine_filter.h
  71. +3
    -3
      chalk/colorspaces/wetsticky/wet_sticky_plugin.cc
  72. +1
    -1
      chalk/colorspaces/wetsticky/wet_sticky_plugin.h
  73. +3
    -3
      chalk/colorspaces/wetsticky/ws/anim.c
  74. +6
    -6
      chalk/colorspaces/wetsticky/ws/cmap.c
  75. +6
    -6
      chalk/colorspaces/wetsticky/ws/x_interface.c
  76. +16
    -16
      chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
  77. +4
    -4
      chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
  78. +4
    -4
      chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc
  79. +1
    -1
      chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.h
  80. +15
    -15
      chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc
  81. +5
    -5
      chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h
  82. +4
    -4
      chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc
  83. +1
    -1
      chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.h
  84. +3
    -3
      chalk/core/createdcop.py
  85. +5
    -5
      chalk/core/kis_alpha_mask.cc
  86. +9
    -9
      chalk/core/kis_alpha_mask.h
  87. +8
    -8
      chalk/core/kis_brush.cc
  88. +5
    -5
      chalk/core/kis_brush.h
  89. +2
    -2
      chalk/core/kis_fill_painter.cc
  90. +1
    -1
      chalk/core/kis_fill_painter.h
  91. +2
    -2
      chalk/core/kis_filter.h
  92. +2
    -2
      chalk/core/kis_filter_config_widget.cc
  93. +1
    -1
      chalk/core/kis_filter_config_widget.h
  94. +10
    -10
      chalk/core/kis_group_layer.cc
  95. +2
    -2
      chalk/core/kis_group_layer.h
  96. +25
    -25
      chalk/core/kis_image.cc
  97. +11
    -11
      chalk/core/kis_image.h
  98. +2
    -2
      chalk/core/kis_imagepipe_brush.cc
  99. +2
    -2
      chalk/core/kis_imagepipe_brush.h
  100. +1
    -1
      chalk/core/kis_iteratorpixeltrait.h
  101. +6
    -6
      chalk/core/kis_iterators_pixel.h
  102. +9
    -9
      chalk/core/kis_layer.cc
  103. +13
    -13
      chalk/core/kis_layer.h
  104. +13
    -13
      chalk/core/kis_merge_visitor.h
  105. +7
    -7
      chalk/core/kis_paint_device.cc
  106. +6
    -6
      chalk/core/kis_paint_device.h
  107. +2
    -2
      chalk/core/kis_paint_device_iface.cc
  108. +1
    -1
      chalk/core/kis_paint_device_iface.h
  109. +42
    -42
      chalk/core/kis_paint_layer.cc
  110. +18
    -18
      chalk/core/kis_paint_layer.h
  111. +1
    -1
      chalk/core/kis_painter.cc
  112. +3
    -3
      chalk/core/kis_painter.h
  113. +8
    -8
      chalk/core/kis_paintop.cc
  114. +4
    -4
      chalk/core/kis_paintop.h
  115. +2
    -2
      chalk/core/kis_paintop_registry.cc
  116. +2
    -2
      chalk/core/kis_paintop_registry.h
  117. +1
    -1
      chalk/core/kis_random_accessor.h
  118. +1
    -1
      chalk/core/kis_selection.cc
  119. +3
    -3
      chalk/core/kis_selection.h
  120. +3
    -3
      chalk/doc/DESIGN.obsolete
  121. +3
    -3
      chalk/doc/brush.txt
  122. +80
    -80
      chalk/doc/chalk.xmi
  123. +1
    -1
      chalk/doc/channels_masks_selections
  124. +233
    -233
      chalk/doc/colorspaces.xmi
  125. +5
    -5
      chalk/doc/colorstrategyAPI
  126. +39
    -39
      chalk/doc/controller.xmi
  127. +31
    -31
      chalk/doc/histograms.xmi
  128. +1
    -1
      chalk/doc/hooks
  129. +1
    -1
      chalk/doc/sdk
  130. +3
    -3
      chalk/doc/selections
  131. +5
    -5
      chalk/plugins/filters/blur/blur.cc
  132. +1
    -1
      chalk/plugins/filters/blur/blur.h
  133. +9
    -9
      chalk/plugins/filters/blur/kis_blur_filter.cc
  134. +1
    -1
      chalk/plugins/filters/blur/kis_blur_filter.h
  135. +1
    -1
      chalk/plugins/filters/blur/kis_wdg_blur.cc
  136. +1
    -1
      chalk/plugins/filters/blur/kis_wdg_blur.h
  137. +8
    -8
      chalk/plugins/filters/bumpmap/bumpmap.cc
  138. +3
    -3
      chalk/plugins/filters/bumpmap/bumpmap.h
  139. +142
    -142
      chalk/plugins/filters/cimg/CImg.h
  140. +23
    -23
      chalk/plugins/filters/cimg/kis_cimg_filter.cc
  141. +2
    -2
      chalk/plugins/filters/cimg/kis_cimg_filter.h
  142. +3
    -3
      chalk/plugins/filters/cimg/kis_cimg_plugin.cc
  143. +1
    -1
      chalk/plugins/filters/cimg/kis_cimg_plugin.h
  144. +2
    -2
      chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc
  145. +1
    -1
      chalk/plugins/filters/cimg/kis_cimgconfig_widget.h
  146. +7
    -7
      chalk/plugins/filters/colorify/Colorify.cpp
  147. +2
    -2
      chalk/plugins/filters/colorify/Colorify.h
  148. +1
    -1
      chalk/plugins/filters/colorify/KisWdgColorify.cpp
  149. +1
    -1
      chalk/plugins/filters/colorify/KisWdgColorify.h
  150. +5
    -5
      chalk/plugins/filters/colors/colors.cc
  151. +1
    -1
      chalk/plugins/filters/colors/colors.h
  152. +2
    -2
      chalk/plugins/filters/colors/kis_color_to_alpha.cc
  153. +1
    -1
      chalk/plugins/filters/colors/kis_color_to_alpha.h
  154. +1
    -1
      chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc
  155. +1
    -1
      chalk/plugins/filters/colors/kis_wdg_color_to_alpha.h
  156. +4
    -4
      chalk/plugins/filters/colorsfilters/colorsfilters.cc
  157. +1
    -1
      chalk/plugins/filters/colorsfilters/colorsfilters.h
  158. +4
    -4
      chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
  159. +2
    -2
      chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.h
  160. +4
    -4
      chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
  161. +2
    -2
      chalk/plugins/filters/colorsfilters/kis_perchannel_filter.h
  162. +4
    -4
      chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
  163. +1
    -1
      chalk/plugins/filters/convolutionfilters/convolutionfilters.h
  164. +2
    -2
      chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc
  165. +1
    -1
      chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.h
  166. +2
    -2
      chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc
  167. +1
    -1
      chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.h
  168. +2
    -2
      chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc
  169. +1
    -1
      chalk/plugins/filters/cubismfilter/kis_cubism_filter.h
  170. +3
    -3
      chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc
  171. +1
    -1
      chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.h
  172. +2
    -2
      chalk/plugins/filters/embossfilter/kis_emboss_filter.cc
  173. +1
    -1
      chalk/plugins/filters/embossfilter/kis_emboss_filter.h
  174. +3
    -3
      chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc
  175. +1
    -1
      chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.h
  176. +4
    -4
      chalk/plugins/filters/example/example.cc
  177. +1
    -1
      chalk/plugins/filters/example/example.h
  178. +7
    -7
      chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc
  179. +2
    -2
      chalk/plugins/filters/fastcolortransfer/fastcolortransfer.h
  180. +1
    -1
      chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp
  181. +1
    -1
      chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.h
  182. +11
    -11
      chalk/plugins/filters/halftone/kis_halftone.cpp
  183. +2
    -2
      chalk/plugins/filters/halftone/kis_halftone.h
  184. +5
    -5
      chalk/plugins/filters/imageenhancement/imageenhancement.cpp
  185. +1
    -1
      chalk/plugins/filters/imageenhancement/imageenhancement.h
  186. +6
    -6
      chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.cpp
  187. +1
    -1
      chalk/plugins/filters/imageenhancement/kis_simple_noise_reducer.h
  188. +2
    -2
      chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.cpp
  189. +1
    -1
      chalk/plugins/filters/imageenhancement/kis_wavelet_noise_reduction.h
  190. +2
    -2
      chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp
  191. +1
    -1
      chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.h
  192. +6
    -6
      chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc
  193. +2
    -2
      chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.h
  194. +2
    -2
      chalk/plugins/filters/levelfilter/kgradientslider.cc
  195. +1
    -1
      chalk/plugins/filters/levelfilter/kgradientslider.h
  196. +4
    -4
      chalk/plugins/filters/levelfilter/kis_level_filter.cc
  197. +2
    -2
      chalk/plugins/filters/levelfilter/kis_level_filter.h
  198. +4
    -4
      chalk/plugins/filters/levelfilter/levelfilter.cc
  199. +1
    -1
      chalk/plugins/filters/levelfilter/levelfilter.h
  200. +2
    -2
      chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp
  201. +1
    -1
      chalk/plugins/filters/noisefilter/kis_wdg_noise.h
  202. +6
    -6
      chalk/plugins/filters/noisefilter/noisefilter.cc
  203. +2
    -2
      chalk/plugins/filters/noisefilter/noisefilter.h
  204. +2
    -2
      chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
  205. +1
    -1
      chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.h
  206. +3
    -3
      chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc
  207. +1
    -1
      chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.h
  208. +2
    -2
      chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc
  209. +1
    -1
      chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.h
  210. +4
    -4
      chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc
  211. +1
    -1
      chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.h
  212. +2
    -2
      chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
  213. +1
    -1
      chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.h
  214. +3
    -3
      chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc
  215. +1
    -1
      chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.h
  216. +2
    -2
      chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp
  217. +1
    -1
      chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.h
  218. +6
    -6
      chalk/plugins/filters/randompickfilter/randompickfilter.cc
  219. +2
    -2
      chalk/plugins/filters/randompickfilter/randompickfilter.h
  220. +2
    -2
      chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc
  221. +1
    -1
      chalk/plugins/filters/roundcorners/kis_round_corners_filter.h
  222. +4
    -4
      chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc
  223. +1
    -1
      chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.h
  224. +2
    -2
      chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc
  225. +1
    -1
      chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.h
  226. +4
    -4
      chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc
  227. +1
    -1
      chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.h
  228. +2
    -2
      chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc
  229. +1
    -1
      chalk/plugins/filters/sobelfilter/kis_sobel_filter.h
  230. +4
    -4
      chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc
  231. +1
    -1
      chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.h
  232. +4
    -4
      chalk/plugins/filters/threadtest/threadtest.cc
  233. +1
    -1
      chalk/plugins/filters/threadtest/threadtest.h
  234. +5
    -5
      chalk/plugins/filters/unsharp/kis_unsharp_filter.cc
  235. +2
    -2
      chalk/plugins/filters/unsharp/kis_unsharp_filter.h
  236. +1
    -1
      chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc
  237. +1
    -1
      chalk/plugins/filters/unsharp/kis_wdg_unsharp.h
  238. +5
    -5
      chalk/plugins/filters/unsharp/unsharp.cc
  239. +1
    -1
      chalk/plugins/filters/unsharp/unsharp.h
  240. +2
    -2
      chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp
  241. +1
    -1
      chalk/plugins/filters/wavefilter/kis_wdg_wave.h
  242. +6
    -6
      chalk/plugins/filters/wavefilter/wavefilter.cc
  243. +2
    -2
      chalk/plugins/filters/wavefilter/wavefilter.h
  244. +4
    -4
      chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
  245. +1
    -1
      chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.h
  246. +2
    -2
      chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
  247. +12
    -12
      chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
  248. +2
    -2
      chalk/plugins/paintops/defaultpaintops/kis_brushop.h
  249. +2
    -2
      chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
  250. +4
    -4
      chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
  251. +3
    -3
      chalk/plugins/paintops/defaultpaintops/kis_penop.cc
  252. +13
    -13
      chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
  253. +2
    -2
      chalk/plugins/paintops/defaultpaintops/kis_smudgeop.h
  254. +4
    -4
      chalk/plugins/tools/defaulttools/default_tools.cc
  255. +1
    -1
      chalk/plugins/tools/defaulttools/default_tools.h
  256. +2
    -2
      chalk/plugins/tools/defaulttools/kis_tool_brush.cc
  257. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_brush.h
  258. +2
    -2
      chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
  259. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_colorpicker.h
  260. +2
    -2
      chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
  261. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_duplicate.h
  262. +2
    -2
      chalk/plugins/tools/defaulttools/kis_tool_fill.cc
  263. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_fill.h
  264. +2
    -2
      chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
  265. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_gradient.h
  266. +6
    -6
      chalk/plugins/tools/defaulttools/kis_tool_text.cc
  267. +1
    -1
      chalk/plugins/tools/defaulttools/kis_tool_text.h
  268. +4
    -4
      chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
  269. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_brush.h
  270. +2
    -2
      chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
  271. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.h
  272. +2
    -2
      chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
  273. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.h
  274. +4
    -4
      chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
  275. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h
  276. +2
    -2
      chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
  277. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_outline.h
  278. +2
    -2
      chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
  279. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.h
  280. +2
    -2
      chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
  281. +1
    -1
      chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.h
  282. +4
    -4
      chalk/plugins/tools/selectiontools/selection_tools.cc
  283. +1
    -1
      chalk/plugins/tools/selectiontools/selection_tools.h
  284. +2
    -2
      chalk/plugins/tools/tool_crop/kis_tool_crop.cc
  285. +1
    -1
      chalk/plugins/tools/tool_crop/kis_tool_crop.h
  286. +4
    -4
      chalk/plugins/tools/tool_crop/tool_crop.cc
  287. +1
    -1
      chalk/plugins/tools/tool_crop/tool_crop.h
  288. +5
    -5
      chalk/plugins/tools/tool_curves/kis_tool_curve.cc
  289. +2
    -2
      chalk/plugins/tools/tool_curves/kis_tool_curve.h
  290. +10
    -10
      chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
  291. +2
    -2
      chalk/plugins/tools/tool_curves/kis_tool_moutline.h
  292. +4
    -4
      chalk/plugins/tools/tool_curves/tool_curves.cc
  293. +1
    -1
      chalk/plugins/tools/tool_curves/tool_curves.h
  294. +6
    -6
      chalk/plugins/tools/tool_filter/kis_filterop.cc
  295. +2
    -2
      chalk/plugins/tools/tool_filter/kis_tool_filter.cc
  296. +1
    -1
      chalk/plugins/tools/tool_filter/kis_tool_filter.h
  297. +4
    -4
      chalk/plugins/tools/tool_filter/tool_filter.cc
  298. +1
    -1
      chalk/plugins/tools/tool_filter/tool_filter.h
  299. +1
    -1
      chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
  300. +1
    -1
      chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h
  301. +4
    -4
      chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
  302. +1
    -1
      chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.h
  303. +2
    -2
      chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
  304. +1
    -1
      chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h
  305. +4
    -4
      chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
  306. +1
    -1
      chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.h
  307. +4
    -4
      chalk/plugins/tools/tool_polygon/tool_polygon.cc
  308. +1
    -1
      chalk/plugins/tools/tool_polygon/tool_polygon.h
  309. +4
    -4
      chalk/plugins/tools/tool_polyline/tool_polyline.cc
  310. +1
    -1
      chalk/plugins/tools/tool_polyline/tool_polyline.h
  311. +2
    -2
      chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
  312. +1
    -1
      chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.h
  313. +4
    -4
      chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
  314. +1
    -1
      chalk/plugins/tools/tool_selectsimilar/selectsimilar.h
  315. +2
    -2
      chalk/plugins/tools/tool_star/kis_tool_star.cc
  316. +1
    -1
      chalk/plugins/tools/tool_star/kis_tool_star.h
  317. +4
    -4
      chalk/plugins/tools/tool_star/tool_star.cc
  318. +1
    -1
      chalk/plugins/tools/tool_star/tool_star.h
  319. +2
    -2
      chalk/plugins/tools/tool_transform/kis_tool_transform.cc
  320. +1
    -1
      chalk/plugins/tools/tool_transform/kis_tool_transform.h
  321. +4
    -4
      chalk/plugins/tools/tool_transform/tool_transform.cc
  322. +1
    -1
      chalk/plugins/tools/tool_transform/tool_transform.h
  323. +4
    -4
      chalk/plugins/viewplugins/colorrange/colorrange.cc
  324. +1
    -1
      chalk/plugins/viewplugins/colorrange/colorrange.h
  325. +2
    -2
      chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
  326. +2
    -2
      chalk/plugins/viewplugins/colorrange/dlg_colorrange.h
  327. +4
    -4
      chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
  328. +1
    -1
      chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.h
  329. +2
    -2
      chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
  330. +1
    -1
      chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.h
  331. +2
    -2
      chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
  332. +1
    -1
      chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.h
  333. +3
    -3
      chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
  334. +4
    -4
      chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc
  335. +1
    -1
      chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.h
  336. +4
    -4
      chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc
  337. +1
    -1
      chalk/plugins/viewplugins/filtersgallery/filters_gallery.h
  338. +2
    -2
      chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
  339. +1
    -1
      chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.h
  340. +2
    -2
      chalk/plugins/viewplugins/histogram/dlg_histogram.cc
  341. +1
    -1
      chalk/plugins/viewplugins/histogram/dlg_histogram.h
  342. +4
    -4
      chalk/plugins/viewplugins/histogram/histogram.cc
  343. +1
    -1
      chalk/plugins/viewplugins/histogram/histogram.h
  344. +2
    -2
      chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc
  345. +1
    -1
      chalk/plugins/viewplugins/histogram/kis_histogram_widget.h
  346. +5
    -5
      chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc
  347. +2
    -2
      chalk/plugins/viewplugins/histogram_docker/histogramdocker.h
  348. +3
    -3
      chalk/plugins/viewplugins/history_docker/historydocker.cc
  349. +1
    -1
      chalk/plugins/viewplugins/history_docker/historydocker.h
  350. +2
    -2
      chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
  351. +2
    -2
      chalk/plugins/viewplugins/imagesize/dlg_imagesize.h
  352. +2
    -2
      chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
  353. +1
    -1
      chalk/plugins/viewplugins/imagesize/dlg_layersize.h
  354. +4
    -4
      chalk/plugins/viewplugins/imagesize/imagesize.cc
  355. +1
    -1
      chalk/plugins/viewplugins/imagesize/imagesize.h
  356. +1
    -1
      chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
  357. +1
    -1
      chalk/plugins/viewplugins/modify_selection/dlg_border_selection.h
  358. +1
    -1
      chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
  359. +1
    -1
      chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.h
  360. +1
    -1
      chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
  361. +1
    -1
      chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.h
  362. +4
    -4
      chalk/plugins/viewplugins/modify_selection/modify_selection.cc
  363. +1
    -1
      chalk/plugins/viewplugins/modify_selection/modify_selection.h
  364. +2
    -2
      chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
  365. +1
    -1
      chalk/plugins/viewplugins/performancetest/dlg_perftest.h
  366. +4
    -4
      chalk/plugins/viewplugins/performancetest/perftest.cc
  367. +1
    -1
      chalk/plugins/viewplugins/performancetest/perftest.h
  368. +2
    -2
      chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
  369. +1
    -1
      chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.h
  370. +4
    -4
      chalk/plugins/viewplugins/rotateimage/rotateimage.cc
  371. +1
    -1
      chalk/plugins/viewplugins/rotateimage/rotateimage.h
  372. +15
    -15
      chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
  373. +3
    -3
      chalk/plugins/viewplugins/screenshot/ksnapshot.h
  374. +2
    -2
      chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
  375. +1
    -1
      chalk/plugins/viewplugins/screenshot/regiongrabber.h
  376. +3
    -3
      chalk/plugins/viewplugins/screenshot/screenshot.cpp
  377. +1
    -1
      chalk/plugins/viewplugins/screenshot/screenshot.h
  378. +4
    -4
      chalk/plugins/viewplugins/scripting/scripting.cc
  379. +1
    -1
      chalk/plugins/viewplugins/scripting/scripting.h
  380. +4
    -4
      chalk/plugins/viewplugins/selectopaque/selectopaque.cc
  381. +1
    -1
      chalk/plugins/viewplugins/selectopaque/selectopaque.h
  382. +2
    -2
      chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
  383. +1
    -1
      chalk/plugins/viewplugins/separate_channels/dlg_separate.h
  384. +4
    -4
      chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc
  385. +1
    -1
      chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.h
  386. +2
    -2
      chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
  387. +1
    -1
      chalk/plugins/viewplugins/shearimage/dlg_shearimage.h
  388. +4
    -4
      chalk/plugins/viewplugins/shearimage/shearimage.cc
  389. +1
    -1
      chalk/plugins/viewplugins/shearimage/shearimage.h
  390. +2
    -2
      chalk/plugins/viewplugins/substrate/dlg_substrate.cc
  391. +1
    -1
      chalk/plugins/viewplugins/substrate/dlg_substrate.h
  392. +4
    -4
      chalk/plugins/viewplugins/substrate/substrate.cc
  393. +1
    -1
      chalk/plugins/viewplugins/substrate/substrate.h
  394. +2
    -2
      chalk/plugins/viewplugins/variations/dlg_variations.cc
  395. +1
    -1
      chalk/plugins/viewplugins/variations/dlg_variations.h
  396. +4
    -4
      chalk/plugins/viewplugins/variations/variations.cc
  397. +1
    -1
      chalk/plugins/viewplugins/variations/variations.h
  398. +1
    -1
      chalk/sdk/kis_progress_subject.h
  399. +2
    -2
      chalk/ui/kcurve.cc
  400. +1
    -1
      chalk/ui/kcurve.h
  401. +1
    -1
      chalk/ui/kis_autobrush.cc
  402. +1
    -1
      chalk/ui/kis_autobrush.h
  403. +1
    -1
      chalk/ui/kis_autogradient.cc
  404. +1
    -1
      chalk/ui/kis_autogradient.h
  405. +2
    -2
      chalk/ui/kis_birdeye_box.cc
  406. +1
    -1
      chalk/ui/kis_birdeye_box.h
  407. +3
    -3
      chalk/ui/kis_brush_chooser.cc
  408. +1
    -1
      chalk/ui/kis_brush_chooser.h
  409. +2
    -2
      chalk/ui/kis_canvas.cc
  410. +1
    -1
      chalk/ui/kis_canvas.h
  411. +2
    -2
      chalk/ui/kis_cmb_composite.cc
  412. +1
    -1
      chalk/ui/kis_cmb_composite.h
  413. +2
    -2
      chalk/ui/kis_cmb_idlist.cc
  414. +1
    -1
      chalk/ui/kis_cmb_idlist.h
  415. +4
    -4
      chalk/ui/kis_color_cup.cc
  416. +1
    -1
      chalk/ui/kis_color_cup.h
  417. +2
    -2
      chalk/ui/kis_controlframe.cc
  418. +1
    -1
      chalk/ui/kis_controlframe.h
  419. +27
    -27
      chalk/ui/kis_cursor.cc
  420. +2
    -2
      chalk/ui/kis_custom_brush.cc
  421. +1
    -1
      chalk/ui/kis_custom_brush.h
  422. +2
    -2
      chalk/ui/kis_custom_image_widget.cc
  423. +2
    -2
      chalk/ui/kis_custom_image_widget.h
  424. +2
    -2
      chalk/ui/kis_custom_palette.cc
  425. +1
    -1
      chalk/ui/kis_custom_palette.h
  426. +2
    -2
      chalk/ui/kis_custom_pattern.cc
  427. +1
    -1
      chalk/ui/kis_custom_pattern.h
  428. +2
    -2
      chalk/ui/kis_dlg_adj_layer_props.cc
  429. +2
    -2
      chalk/ui/kis_dlg_adj_layer_props.h
  430. +2
    -2
      chalk/ui/kis_dlg_adjustment_layer.cc
  431. +2
    -2
      chalk/ui/kis_dlg_adjustment_layer.h
  432. +2
    -2
      chalk/ui/kis_dlg_apply_profile.cc
  433. +1
    -1
      chalk/ui/kis_dlg_apply_profile.h
  434. +2
    -2
      chalk/ui/kis_dlg_image_properties.cc
  435. +1
    -1
      chalk/ui/kis_dlg_image_properties.h
  436. +2
    -2
      chalk/ui/kis_dlg_layer_properties.cc
  437. +1
    -1
      chalk/ui/kis_dlg_layer_properties.h
  438. +2
    -2
      chalk/ui/kis_dlg_new_layer.cc
  439. +1
    -1
      chalk/ui/kis_dlg_new_layer.h
  440. +13
    -13
      chalk/ui/kis_dlg_preferences.cc
  441. +8
    -8
      chalk/ui/kis_dlg_preferences.h
  442. +10
    -10
      chalk/ui/kis_doc.cc
  443. +6
    -6
      chalk/ui/kis_doc.h
  444. +4
    -4
      chalk/ui/kis_double_widget.cc
  445. +2
    -2
      chalk/ui/kis_double_widget.h
  446. +4
    -4
      chalk/ui/kis_factory.cc
  447. +2
    -2
      chalk/ui/kis_factory.h
  448. +1
    -1
      chalk/ui/kis_filter_manager.h
  449. +13
    -13
      chalk/ui/kis_filters_listview.cc
  450. +6
    -6
      chalk/ui/kis_filters_listview.h
  451. +3
    -3
      chalk/ui/kis_gradient_chooser.cc
  452. +2
    -2
      chalk/ui/kis_gradient_chooser.h
  453. +2
    -2
      chalk/ui/kis_gradient_slider_widget.cc
  454. +1
    -1
      chalk/ui/kis_gradient_slider_widget.h
  455. +2
    -2
      chalk/ui/kis_grid_manager.cpp
  456. +1
    -1
      chalk/ui/kis_grid_manager.h
  457. +2
    -2
      chalk/ui/kis_histogram_view.cc
  458. +1
    -1
      chalk/ui/kis_histogram_view.h
  459. +1
    -1
      chalk/ui/kis_iconwidget.cc
  460. +1
    -1
      chalk/ui/kis_iconwidget.h
  461. +6
    -6
      chalk/ui/kis_import_catcher.cc
  462. +4
    -4
      chalk/ui/kis_int_spinbox.cc
  463. +6
    -6
      chalk/ui/kis_int_spinbox.h
  464. +1
    -1
      chalk/ui/kis_itemchooser.cc
  465. +1
    -1
      chalk/ui/kis_itemchooser.h
  466. +2
    -2
      chalk/ui/kis_label_cursor_pos.cc
  467. +1
    -1
      chalk/ui/kis_label_cursor_pos.h
  468. +2
    -2
      chalk/ui/kis_label_progress.cc
  469. +1
    -1
      chalk/ui/kis_label_progress.h
  470. +2
    -2
      chalk/ui/kis_label_zoom.h
  471. +44
    -44
      chalk/ui/kis_layerbox.cc
  472. +10
    -10
      chalk/ui/kis_layerbox.h
  473. +19
    -19
      chalk/ui/kis_layerlist.cc
  474. +5
    -5
      chalk/ui/kis_layerlist.h
  475. +5
    -5
      chalk/ui/kis_load_visitor.h
  476. +2
    -2
      chalk/ui/kis_multi_bool_filter_widget.cc
  477. +1
    -1
      chalk/ui/kis_multi_bool_filter_widget.h
  478. +4
    -4
      chalk/ui/kis_multi_double_filter_widget.cc
  479. +2
    -2
      chalk/ui/kis_multi_double_filter_widget.h
  480. +4
    -4
      chalk/ui/kis_multi_integer_filter_widget.cc
  481. +2
    -2
      chalk/ui/kis_multi_integer_filter_widget.h
  482. +2
    -2
      chalk/ui/kis_opengl_canvas.cc
  483. +1
    -1
      chalk/ui/kis_opengl_canvas.h
  484. +2
    -2
      chalk/ui/kis_paintop_box.cc
  485. +1
    -1
      chalk/ui/kis_paintop_box.h
  486. +2
    -2
      chalk/ui/kis_palette_view.cc
  487. +1
    -1
      chalk/ui/kis_palette_view.h
  488. +2
    -2
      chalk/ui/kis_palette_widget.cc
  489. +1
    -1
      chalk/ui/kis_palette_widget.h
  490. +1
    -1
      chalk/ui/kis_part_layer.h
  491. +2
    -2
      chalk/ui/kis_part_layer_handler.cc
  492. +1
    -1
      chalk/ui/kis_part_layer_handler.h
  493. +1
    -1
      chalk/ui/kis_pattern_chooser.cc
  494. +1
    -1
      chalk/ui/kis_pattern_chooser.h
  495. +2
    -2
      chalk/ui/kis_perspective_grid_manager.cpp
  496. +1
    -1
      chalk/ui/kis_perspective_grid_manager.h
  497. +3
    -3
      chalk/ui/kis_populate_visitor.h
  498. +2
    -2
      chalk/ui/kis_previewdialog.cc
  499. +1
    -1
      chalk/ui/kis_previewdialog.h
  500. +2
    -2
      chalk/ui/kis_previewwidget.cc

+ 3
- 3
chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc View File

@ -38,9 +38,9 @@ namespace {
const TQ_UINT8 PIXEL_MASK = 0;
}
KisAlphaColorSpace::KisAlphaColorSpace(KisColorSpaceFactoryRegistry * tqparent,
KisAlphaColorSpace::KisAlphaColorSpace(KisColorSpaceFactoryRegistry * parent,
KisProfile *p) :
KisU8BaseColorSpace(KisID("ALPHA", i18n("Alpha tqmask")), TYPE_GRAY_8, icSigGrayData, tqparent, p)
KisU8BaseColorSpace(KisID("ALPHA", i18n("Alpha mask")), TYPE_GRAY_8, icSigGrayData, parent, p)
{
m_channels.push_back(new KisChannelInfo(i18n("Alpha"), i18n("A"), 0, KisChannelInfo::ALPHA, KisChannelInfo::UINT8));
m_alphaPos = 0;
@ -125,7 +125,7 @@ bool KisAlphaColorSpace::convertPixelsTo(const TQ_UINT8 *src,
}
//XXX bitblt of ColorSpaceAlpha does not take tqmask into consideration as this is probably not
//XXX bitblt of ColorSpaceAlpha does not take mask into consideration as this is probably not
// used ever
void KisAlphaColorSpace::bitBlt(TQ_UINT8 *dst,
TQ_INT32 dststride,


+ 3
- 3
chalk/chalkcolor/colorspaces/kis_alpha_colorspace.h View File

@ -24,12 +24,12 @@
#include "kis_u8_base_colorspace.h"
/**
* The alpha tqmask is a special color strategy that treats all pixels as
* alpha value with a colour common to the tqmask. The default color is white.
* The alpha mask is a special color strategy that treats all pixels as
* alpha value with a colour common to the mask. The default color is white.
*/
class KisAlphaColorSpace : public KisU8BaseColorSpace {
public:
KisAlphaColorSpace(KisColorSpaceFactoryRegistry * tqparent,
KisAlphaColorSpace(KisColorSpaceFactoryRegistry * parent,
KisProfile *p);
virtual ~KisAlphaColorSpace();


+ 32
- 32
chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc View File

@ -33,10 +33,10 @@
#include "kis_color_conversions.h"
#include "kis_integer_maths.h"
KisLabColorSpace::KisLabColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p)
KisLabColorSpace::KisLabColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p)
: KisU16BaseColorSpace(KisID("LABA", i18n("L*a*b* (16-bit integer/channel)")),
COLORSPACE_SH(PT_Lab)|CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1),
icSigLabData, tqparent, p)
icSigLabData, parent, p)
{
m_channels.push_back(new KisChannelInfo(i18n("Lightness"), i18n("L"), CHANNEL_L * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQColor(100,100,100)));
@ -267,19 +267,19 @@ void KisLabColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
while (rows > 0) {
const Pixel *src = reinterpret_cast<const Pixel *>(srcRowStart);
Pixel *dst = reinterpret_cast<Pixel *>(dstRowStart);
const TQ_UINT8 *tqmask = maskRowStart;
const TQ_UINT8 *mask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
TQ_UINT16 srcAlpha = src->alpha;
// apply the alphatqmask
if (tqmask != 0) {
if (*tqmask != OPACITY_OPAQUE) {
srcAlpha = UINT16_MULT(srcAlpha, *tqmask);
// apply the alphamask
if (mask != 0) {
if (*mask != OPACITY_OPAQUE) {
srcAlpha = UINT16_MULT(srcAlpha, *mask);
}
tqmask++;
mask++;
}
if (srcAlpha != U16_OPACITY_TRANSPARENT) {
@ -351,20 +351,20 @@ void KisLabColorSpace::compositeErase(TQ_UINT8 *dst,
{
const Pixel *s = reinterpret_cast<const Pixel *>(src);
Pixel *d = reinterpret_cast<Pixel *>(dst);
const TQ_UINT8 *tqmask = srcAlphaMask;
const TQ_UINT8 *mask = srcAlphaMask;
for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
{
TQ_UINT16 srcAlpha = s->alpha;
// apply the alphatqmask
if (tqmask != 0) {
TQ_UINT8 U8_tqmask = *tqmask;
// apply the alphamask
if (mask != 0) {
TQ_UINT8 U8_mask = *mask;
if (U8_tqmask != OPACITY_OPAQUE) {
srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask));
if (U8_mask != OPACITY_OPAQUE) {
srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask));
}
tqmask++;
mask++;
}
d->alpha = UINT16_MULT(srcAlpha, d->alpha);
}
@ -381,7 +381,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
TQ_INT32 dstRowStride,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
const TQ_UINT8 *mask,
TQ_INT32 maskRowStride,
TQ_UINT8 U8_opacity,
TQ_INT32 rows,
@ -395,7 +395,7 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
//compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -425,16 +425,16 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
//compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
//compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
//compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity);
break;
case COMPOSITE_COPY_RED:
//compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -469,22 +469,22 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
//compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
//compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
//compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -493,24 +493,24 @@ void KisLabColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
//compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
//compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
//compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
//compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
CHANNEL_ALPHA, NUM_COLOR_CHANNELS, NUM_CHANNELS>(
dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
break;
default:


+ 16
- 16
chalk/chalkcolor/colorspaces/kis_lab_colorspace.h View File

@ -29,7 +29,7 @@
class KisLabColorSpace : public KisU16BaseColorSpace {
public:
KisLabColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
KisLabColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
virtual ~KisLabColorSpace();
public:
@ -87,22 +87,22 @@ protected:
TQ_INT32 cols,
const KisCompositeOp& op);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
/*
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeHue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeSaturation(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeValue(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeColor(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
*/
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
private:
struct Pixel {
@ -145,7 +145,7 @@ public:
virtual icColorSpaceSignature colorSpaceSignature() { return icSigLabData; };
virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) { return new KisLabColorSpace(tqparent, p); };
virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) { return new KisLabColorSpace(parent, p); };
virtual TQString defaultProfile() { return "Lab built-in - (lcms internal)"; };
};


+ 39
- 39
chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc View File

@ -39,9 +39,9 @@
// XXX: Maybe use TYPE_XYZ_DBL for an extra stimulating performance hit? People shouldn't depend
// on this fallback...
KisXyzColorSpace::KisXyzColorSpace(KisColorSpaceFactoryRegistry * tqparent,
KisXyzColorSpace::KisXyzColorSpace(KisColorSpaceFactoryRegistry * parent,
KisProfile *p) :
KisU16BaseColorSpace(KisID("XYZA", i18n("XYZ/Alpha")), (COLORSPACE_SH(PT_XYZ)|CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)), icSigCmykData, tqparent, p)
KisU16BaseColorSpace(KisID("XYZA", i18n("XYZ/Alpha")), (COLORSPACE_SH(PT_XYZ)|CHANNELS_SH(3)|BYTES_SH(2)|EXTRA_SH(1)), icSigCmykData, parent, p)
{
m_channels.push_back(new KisChannelInfo(i18n("X"), i18n("X"), 0, KisChannelInfo::COLOR, KisChannelInfo::UINT8));
m_channels.push_back(new KisChannelInfo(i18n("Y"), i18n("Y"), 1, KisChannelInfo::COLOR, KisChannelInfo::UINT8));
@ -125,21 +125,21 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
const TQ_UINT8 *tqmask = maskRowStart;
const TQ_UINT8 *mask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
TQ_UINT16 srcAlpha = src[PIXEL_ALPHA];
// apply the alphatqmask
if (tqmask != 0) {
TQ_UINT8 U8_tqmask = *tqmask;
// apply the alphamask
if (mask != 0) {
TQ_UINT8 U8_mask = *mask;
if (U8_tqmask != OPACITY_OPAQUE) {
srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask));
if (U8_mask != OPACITY_OPAQUE) {
srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask));
}
tqmask++;
mask++;
}
if (srcAlpha != U16_OPACITY_TRANSPARENT) {
@ -198,7 +198,7 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \
TQ_INT32 columns = numColumns; \
const TQ_UINT8 *tqmask = maskRowStart; \
const TQ_UINT8 *mask = maskRowStart; \
\
while (columns > 0) { \
\
@ -207,13 +207,13 @@ void KisXyzColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowStrid
\
srcAlpha = TQMIN(srcAlpha, dstAlpha); \
\
if (tqmask != 0) { \
TQ_UINT8 U8_tqmask = *tqmask; \
if (mask != 0) { \
TQ_UINT8 U8_mask = *mask; \
\
if (U8_tqmask != OPACITY_OPAQUE) { \
srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); \
if (U8_mask != OPACITY_OPAQUE) { \
srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); \
} \
tqmask++; \
mask++; \
} \
\
if (srcAlpha != U16_OPACITY_TRANSPARENT) { \
@ -437,20 +437,20 @@ void KisXyzColorSpace::compositeErase(TQ_UINT8 *dst,
{
const Pixel *s = reinterpret_cast<const Pixel *>(src);
Pixel *d = reinterpret_cast<Pixel *>(dst);
const TQ_UINT8 *tqmask = srcAlphaMask;
const TQ_UINT8 *mask = srcAlphaMask;
for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
{
TQ_UINT16 srcAlpha = s -> alpha;
// apply the alphatqmask
if (tqmask != 0) {
TQ_UINT8 U8_tqmask = *tqmask;
// apply the alphamask
if (mask != 0) {
TQ_UINT8 U8_mask = *mask;
if (U8_tqmask != OPACITY_OPAQUE) {
srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask));
if (U8_mask != OPACITY_OPAQUE) {
srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask));
}
tqmask++;
mask++;
}
d -> alpha = UINT16_MULT(srcAlpha, d -> alpha);
}
@ -467,7 +467,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
TQ_INT32 dstRowStride,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
const TQ_UINT8 *mask,
TQ_INT32 maskRowStride,
TQ_UINT8 U8_opacity,
TQ_INT32 rows,
@ -481,7 +481,7 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
//compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -510,16 +510,16 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
//compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity);
break;
case COMPOSITE_COPY_RED:
//compositeCopyRed(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -554,22 +554,22 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
//compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -578,24 +578,24 @@ void KisXyzColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
PIXEL_ALPHA, xyz::MAX_CHANNEL_XYZ, xyz::MAX_CHANNEL_XYZA>(
dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
break;
default:


+ 11
- 11
chalk/chalkcolor/colorspaces/kis_xyz_colorspace.h View File

@ -43,7 +43,7 @@ public:
};
public:
KisXyzColorSpace(KisColorSpaceFactoryRegistry * tqparent,
KisXyzColorSpace(KisColorSpaceFactoryRegistry * parent,
KisProfile *p);
virtual ~KisXyzColorSpace();
@ -87,16 +87,16 @@ public:
KisCompositeOpList userVisiblecompositeOps() const;
protected:
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *tqmask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOver(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeMultiply(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDivide(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeScreen(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeOverlay(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDodge(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeBurn(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeDarken(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeLighten(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
void compositeErase(TQ_UINT8 *dst, TQ_INT32 dstRowStride, const TQ_UINT8 *src, TQ_INT32 srcRowStride, const TQ_UINT8 *mask, TQ_INT32 maskRowStride, TQ_INT32 rows, TQ_INT32 columns, TQ_UINT16 opacity);
private:


+ 2
- 2
chalk/chalkcolor/kis_abstract_colorspace.cc View File

@ -63,9 +63,9 @@ class KisColorAdjustmentImpl : public KisColorAdjustment
KisAbstractColorSpace::KisAbstractColorSpace(const KisID& id,
DWORD cmType,
icColorSpaceSignature colorSpaceSignature,
KisColorSpaceFactoryRegistry * tqparent,
KisColorSpaceFactoryRegistry * parent,
KisProfile *p)
: m_parent( tqparent )
: m_parent( parent )
, m_profile( p )
, m_id( id )
, m_cmType( cmType )


+ 8
- 8
chalk/chalkcolor/kis_abstract_colorspace.h View File

@ -53,13 +53,13 @@ public:
* @param id The unique human and machine readable identifiation of this colorspace
* @param cmType the lcms type indentification for this colorspace, may be 0
* @param colorSpaceSignature the icc identification for this colorspace, may be 0
* @param tqparent the registry that owns this instance
* @param parent the registry that owns this instance
* @param profile the profile this colorspace uses for transforms
*/
KisAbstractColorSpace(const KisID & id,
DWORD cmType,
icColorSpaceSignature colorSpaceSignature,
KisColorSpaceFactoryRegistry * tqparent,
KisColorSpaceFactoryRegistry * parent,
KisProfile *profile);
void init();
@ -229,7 +229,7 @@ protected:
const ColorType *src = reinterpret_cast<const ColorType*>(srcRowStart);
ColorType *dst = reinterpret_cast<ColorType*>(dstRowStart);
const TQ_UINT8 *tqmask = maskRowStart;
const TQ_UINT8 *mask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
@ -237,12 +237,12 @@ protected:
ColorType srcAlpha = src[AlphaPos];
ColorType dstAlpha = dst[AlphaPos];
// apply the alphatqmask
if(tqmask != 0)
// apply the alphamask
if(mask != 0)
{
if(*tqmask != OPACITY_OPAQUE)
srcAlpha = nativeMult(srcAlpha, uint8ToNative(*tqmask));
tqmask++;
if(*mask != OPACITY_OPAQUE)
srcAlpha = nativeMult(srcAlpha, uint8ToNative(*mask));
mask++;
}
if (opacity != OPACITY_OPAQUE) {


+ 3
- 3
chalk/chalkcolor/kis_colorspace.h View File

@ -314,14 +314,14 @@ public:
virtual void multiplyAlpha(TQ_UINT8 * pixels, TQ_UINT8 alpha, TQ_INT32 nPixels) = 0;
/**
* Applies the specified 8-bit alpha tqmask to the pixels. We assume that there are just
* Applies the specified 8-bit alpha mask to the pixels. We assume that there are just
* as many alpha values as pixels but we do not check this; the alpha values
* are assumed to be 8-bits.
*/
virtual void applyAlphaU8Mask(TQ_UINT8 * pixels, TQ_UINT8 * alpha, TQ_INT32 nPixels) = 0;
/**
* Applies the inverted 8-bit alpha tqmask to the pixels. We assume that there are just
* Applies the inverted 8-bit alpha mask to the pixels. We assume that there are just
* as many alpha values as pixels but we do not check this; the alpha values
* are assumed to be 8-bits.
*/
@ -436,7 +436,7 @@ public:
virtual icColorSpaceSignature colorSpaceSignature() = 0;
virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *) = 0;
virtual KisColorSpace *createColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *) = 0;
/**
* Returns the default icc profile for use with this colorspace. This may be ""


+ 3
- 3
chalk/chalkcolor/kis_colorspace_iface.cc View File

@ -24,10 +24,10 @@
#include <dcopclient.h>
KisColorSpaceIface::KisColorSpaceIface( KisColorSpace * tqparent )
: DCOPObject(tqparent->id().id().latin1())
KisColorSpaceIface::KisColorSpaceIface( KisColorSpace * parent )
: DCOPObject(parent->id().id().latin1())
{
m_parent = tqparent;
m_parent = parent;
}
TQByteArray KisColorSpaceIface::invertColor(TQByteArray src, TQ_INT32 nPixels)


+ 1
- 1
chalk/chalkcolor/kis_colorspace_iface.h View File

@ -30,7 +30,7 @@ class KisColorSpaceIface : public DCOPObject
{
K_DCOP
public:
KisColorSpaceIface( KisColorSpace * tqparent );
KisColorSpaceIface( KisColorSpace * parent );
k_dcop:
TQByteArray invertColor(TQByteArray src, TQ_INT32 nPixels);


+ 2
- 2
chalk/chalkcolor/kis_f16half_base_colorspace.h View File

@ -63,9 +63,9 @@ class KisF16HalfBaseColorSpace : public KisAbstractColorSpace {
public:
KisF16HalfBaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature,
KisColorSpaceFactoryRegistry * tqparent,
KisColorSpaceFactoryRegistry * parent,
KisProfile *p)
: KisAbstractColorSpace(id, cmType, colorSpaceSignature, tqparent, p)
: KisAbstractColorSpace(id, cmType, colorSpaceSignature, parent, p)
{
m_alphaSize = sizeof(half);
};


+ 2
- 2
chalk/chalkcolor/kis_f32_base_colorspace.h View File

@ -58,8 +58,8 @@ class KisF32BaseColorSpace : public KisAbstractColorSpace {
public:
KisF32BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature, KisColorSpaceFactoryRegistry * tqparent, KisProfile *p)
: KisAbstractColorSpace(id, cmType, colorSpaceSignature, tqparent, p)
KisF32BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature, KisColorSpaceFactoryRegistry * parent, KisProfile *p)
: KisAbstractColorSpace(id, cmType, colorSpaceSignature, parent, p)
{
m_alphaSize = sizeof(float);
};


+ 2
- 2
chalk/chalkcolor/kis_u16_base_colorspace.h View File

@ -37,10 +37,10 @@ public:
public:
KisU16BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature,
KisColorSpaceFactoryRegistry * tqparent,
KisColorSpaceFactoryRegistry * parent,
KisProfile *p)
: KisAbstractColorSpace(id, cmType, colorSpaceSignature,
tqparent,
parent,
p)
{
m_alphaSize = sizeof(TQ_UINT16);


+ 2
- 2
chalk/chalkcolor/kis_u8_base_colorspace.h View File

@ -34,9 +34,9 @@ class KisU8BaseColorSpace : public KisAbstractColorSpace {
public:
KisU8BaseColorSpace(const KisID & id, DWORD cmType, icColorSpaceSignature colorSpaceSignature,
KisColorSpaceFactoryRegistry * tqparent,
KisColorSpaceFactoryRegistry * parent,
KisProfile *p)
: KisAbstractColorSpace(id, cmType, colorSpaceSignature, tqparent, p)
: KisAbstractColorSpace(id, cmType, colorSpaceSignature, parent, p)
{
m_alphaSize = sizeof(TQ_UINT8);
};


+ 4
- 4
chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc View File

@ -34,14 +34,14 @@ typedef KGenericFactory<CMYKU16Plugin> CMYKU16PluginFactory;
K_EXPORT_COMPONENT_FACTORY( chalk_cmyk_u16_plugin, CMYKU16PluginFactory( "chalk" ) )
CMYKU16Plugin::CMYKU16Plugin(TQObject *tqparent, const char *name, const TQStringList &)
: KParts::Plugin(tqparent, name)
CMYKU16Plugin::CMYKU16Plugin(TQObject *parent, const char *name, const TQStringList &)
: KParts::Plugin(parent, name)
{
setInstance(CMYKU16PluginFactory::instance());
if ( tqparent->inherits("KisColorSpaceFactoryRegistry") )
if ( parent->inherits("KisColorSpaceFactoryRegistry") )
{
KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( tqparent );
KisColorSpaceFactoryRegistry * f = dynamic_cast<KisColorSpaceFactoryRegistry*>( parent );
KisColorSpace * colorSpaceCMYKU16 = new KisCmykU16ColorSpace(f, 0);
KisColorSpaceFactory * csf = new KisCmykU16ColorSpaceFactory();


+ 1
- 1
chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.h View File

@ -29,7 +29,7 @@ class CMYKU16Plugin : public KParts::Plugin
Q_OBJECT
TQ_OBJECT
public:
CMYKU16Plugin(TQObject *tqparent, const char *name, const TQStringList &);
CMYKU16Plugin(TQObject *parent, const char *name, const TQStringList &);
virtual ~CMYKU16Plugin();
};


+ 39
- 39
chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc View File

@ -40,8 +40,8 @@ namespace {
const TQ_INT32 MAX_CHANNEL_CMYKA = 5;
}
KisCmykU16ColorSpace::KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p) :
KisU16BaseColorSpace(KisID("CMYKA16", i18n("CMYK (16-bit integer/channel)")), TYPE_CMYK5_16, icSigCmykData, tqparent, p)
KisCmykU16ColorSpace::KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p) :
KisU16BaseColorSpace(KisID("CMYKA16", i18n("CMYK (16-bit integer/channel)")), TYPE_CMYK5_16, icSigCmykData, parent, p)
{
m_channels.push_back(new KisChannelInfo(i18n("Cyan"), i18n("C"), 0 * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQt::cyan));
m_channels.push_back(new KisChannelInfo(i18n("Magenta"), i18n("M"), 1 * sizeof(TQ_UINT16), KisChannelInfo::COLOR, KisChannelInfo::UINT16, sizeof(TQ_UINT16), TQt::magenta));
@ -216,21 +216,21 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart);
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart);
const TQ_UINT8 *tqmask = maskRowStart;
const TQ_UINT8 *mask = maskRowStart;
TQ_INT32 columns = numColumns;
while (columns > 0) {
TQ_UINT16 srcAlpha = src[PIXEL_ALPHA];
// apply the alphatqmask
if (tqmask != 0) {
TQ_UINT8 U8_tqmask = *tqmask;
// apply the alphamask
if (mask != 0) {
TQ_UINT8 U8_mask = *mask;
if (U8_tqmask != OPACITY_OPAQUE) {
srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask));
if (U8_mask != OPACITY_OPAQUE) {
srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask));
}
tqmask++;
mask++;
}
if (srcAlpha != U16_OPACITY_TRANSPARENT) {
@ -290,7 +290,7 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
const TQ_UINT16 *src = reinterpret_cast<const TQ_UINT16 *>(srcRowStart); \
TQ_UINT16 *dst = reinterpret_cast<TQ_UINT16 *>(dstRowStart); \
TQ_INT32 columns = numColumns; \
const TQ_UINT8 *tqmask = maskRowStart; \
const TQ_UINT8 *mask = maskRowStart; \
\
while (columns > 0) { \
\
@ -299,13 +299,13 @@ void KisCmykU16ColorSpace::compositeOver(TQ_UINT8 *dstRowStart, TQ_INT32 dstRowS
\
srcAlpha = TQMIN(srcAlpha, dstAlpha); \
\
if (tqmask != 0) { \
TQ_UINT8 U8_tqmask = *tqmask; \
if (mask != 0) { \
TQ_UINT8 U8_mask = *mask; \
\
if (U8_tqmask != OPACITY_OPAQUE) { \
srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_tqmask)); \
if (U8_mask != OPACITY_OPAQUE) { \
srcAlpha = UINT16_MULT(srcAlpha, UINT8_TO_UINT16(U8_mask)); \
} \
tqmask++; \
mask++; \
} \
\
if (srcAlpha != U16_OPACITY_TRANSPARENT) { \
@ -528,20 +528,20 @@ void KisCmykU16ColorSpace::compositeErase(TQ_UINT8 *dst,
{
const Pixel *s = reinterpret_cast<const Pixel *>(src);
Pixel *d = reinterpret_cast<Pixel *>(dst);
const TQ_UINT8 *tqmask = srcAlphaMask;
const TQ_UINT8 *mask = srcAlphaMask;
for (TQ_INT32 i = cols; i > 0; i--, s++, d++)
{
TQ_UINT16 srcAlpha = s->alpha;
// apply the alphatqmask
if (tqmask != 0) {
TQ_UINT8 U8_tqmask = *tqmask;
// apply the alphamask
if (mask != 0) {
TQ_UINT8 U8_mask = *mask;
if (U8_tqmask != OPACITY_OPAQUE) {
srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_tqmask));
if (U8_mask != OPACITY_OPAQUE) {
srcAlpha = UINT16_BLEND(srcAlpha, U16_OPACITY_OPAQUE, UINT8_TO_UINT16(U8_mask));
}
tqmask++;
mask++;
}
d->alpha = UINT16_MULT(srcAlpha, d->alpha);
}
@ -559,7 +559,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
TQ_INT32 dstRowStride,
const TQ_UINT8 *src,
TQ_INT32 srcRowStride,
const TQ_UINT8 *tqmask,
const TQ_UINT8 *mask,
TQ_INT32 maskRowStride,
TQ_UINT8 U8_opacity,
TQ_INT32 rows,
@ -573,7 +573,7 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
// Undefined == no composition
break;
case COMPOSITE_OVER:
compositeOver(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeOver(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_IN:
//compositeIn(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -602,16 +602,16 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeDiff(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_MULT:
compositeMultiply(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeMultiply(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DIVIDE:
compositeDivide(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeDivide(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BUMPMAP:
//compositeBumpmap(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_COPY:
compositeCopy(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, U8_opacity);
compositeCopy(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, U8_opacity);
break;
case COMPOSITE_COPY_CYAN:
//compositeCopyCyan(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -646,22 +646,22 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
// No composition.
break;
case COMPOSITE_DARKEN:
compositeDarken(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeDarken(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_LIGHTEN:
compositeLighten(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeLighten(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_HUE:
//compositeHue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeHue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_SATURATION:
//compositeSaturation(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeSaturation(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_VALUE:
//compositeValue(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeValue(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLOR:
//compositeColor(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
//compositeColor(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_COLORIZE:
//compositeColorize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
@ -670,24 +670,24 @@ void KisCmykU16ColorSpace::bitBlt(TQ_UINT8 *dst,
//compositeLuminize(pixelSize(), dst, dstRowStride, src, srcRowStride, rows, cols, opacity);
break;
case COMPOSITE_SCREEN:
compositeScreen(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeScreen(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_OVERLAY:
compositeOverlay(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeOverlay(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ERASE:
compositeErase(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeErase(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_DODGE:
compositeDodge(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeDodge(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_BURN:
compositeBurn(dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride, rows, cols, opacity);
compositeBurn(dst, dstRowStride, src, srcRowStride, mask, maskRowStride, rows, cols, opacity);
break;
case COMPOSITE_ALPHA_DARKEN:
abstractCompositeAlphaDarken<TQ_UINT16, U16Mult, Uint8ToU16, U16OpacityTest,
PIXEL_ALPHA, MAX_CHANNEL_CMYK, MAX_CHANNEL_CMYKA>(
dst, dstRowStride, src, srcRowStride, tqmask, maskRowStride,
dst, dstRowStride, src, srcRowStride, mask, maskRowStride,
rows, cols, opacity, U16Mult(), Uint8ToU16(), U16OpacityTest());
break;
default:


+ 12
- 12
chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.h View File

@ -39,7 +39,7 @@ public:
};
public:
KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * tqparent, KisProfile *p);
KisCmykU16ColorSpace(KisColorSpaceFactoryRegistry * parent, KisProfile *p);
virtual ~KisCmykU16ColorSpace();
virtual bool willDegrade(ColorSpaceIndependence independence)
@ -78,16 +78,16 @@ protected: