Permalink
Browse files

Merge remote-tracking branch 'upstream/master' into filtering

  • Loading branch information...
edgomez committed Apr 25, 2012
2 parents 9e73b03 + ca9156a commit 5a7b42c72ceb3e8b41d5d21835bb7edd28949b03
Showing with 14 additions and 4 deletions.
  1. +3 −0 src/common/colormatrices.c
  2. +4 −4 src/develop/tiling.c
  3. +7 −0 src/iop/wb_presets.c
@@ -132,6 +132,9 @@ static dt_profiled_colormatrix_t dt_profiled_colormatrices[] =
// Robert Park, ColorChecker Passport, strobe, well lit
{ "NIKON D5000", { 852386, 356232, 42389}, { 205353, 1026688, -220184}, { 6348, -292526, 1083313}, {822647, 849106, 688538}},
+ // Isaac Chanin, Wolf Faust IT8, direct sunlight, well lit
+ { "NIKON D5100", { 994339, 388123, 37186}, { 226578, 1268478, -310028}, { 1404, -393173, 1285812}, {705582, 733917, 623779}},
+
// Robert Park, ColorChecker Passport, strobe, well lit
{ "NIKON D7000", { 744919, 228027, -46982}, { 454605, 1326797, -33585}, {-132294, -467194, 985611}, {609375, 629852, 515625}},
View
@@ -932,8 +932,8 @@ _default_process_tiling_roi (struct dt_iop_module_t *self, struct dt_dev_pixelpi
/* calculate tile width and height excl. overlap (i.e. the good part) for output.
values are important for all following processing steps. */
- const int tile_wd = roi_out->width % tiles_x == 0 ? roi_out->width / tiles_x : roi_out->width / tiles_x + 1;
- const int tile_ht = roi_out->height % tiles_y == 0 ? roi_out->height / tiles_y : roi_out->height / tiles_y + 1;
+ const int tile_wd = _align_up(roi_out->width % tiles_x == 0 ? roi_out->width / tiles_x : roi_out->width / tiles_x + 1, xyalign);
+ const int tile_ht = _align_up(roi_out->height % tiles_y == 0 ? roi_out->height / tiles_y : roi_out->height / tiles_y + 1, xyalign);
dt_print(DT_DEBUG_DEV, "[default_process_tiling_roi] use tiling on module '%s' for image with full input size %d x %d\n", self->op, roi_in->width, roi_in->height);
dt_print(DT_DEBUG_DEV, "[default_process_tiling_roi] (%d x %d) tiles with max dimensions %d x %d\n", tiles_x, tiles_y, width, height);
@@ -1443,8 +1443,8 @@ _default_process_tiling_cl_roi (struct dt_iop_module_t *self, struct dt_dev_pixe
/* calculate tile width and height excl. overlap (i.e. the good part) for output.
important for all following processing steps. */
- const int tile_wd = roi_out->width % tiles_x == 0 ? roi_out->width / tiles_x : roi_out->width / tiles_x + 1;
- const int tile_ht = roi_out->height % tiles_y == 0 ? roi_out->height / tiles_y : roi_out->height / tiles_y + 1;
+ const int tile_wd = _align_up(roi_out->width % tiles_x == 0 ? roi_out->width / tiles_x : roi_out->width / tiles_x + 1, xyalign);
+ const int tile_ht = _align_up(roi_out->height % tiles_y == 0 ? roi_out->height / tiles_y : roi_out->height / tiles_y + 1, xyalign);
dt_print(DT_DEBUG_OPENCL, "[default_process_tiling_cl_roi] use tiling on module '%s' for image with full input size %d x %d\n", self->op, roi_in->width, roi_in->height);
View
@@ -1964,6 +1964,13 @@ const wb_data wb_preset[] = {
{ "NIKON", "D700", "2700K", 0, { 1.066406, 1, 2.679687, 0 } },
{ "NIKON", "D700", "5000K", 0, { 1.777344, 1, 1.402344, 0 } },
+ { "NIKON", "D800", Incandescent, 0, { 1.289063, 1, 2.175781, 0 } },
+ { "NIKON", "D800", CoolWhiteFluorescent, 0, { 1.765625, 1, 2.003906, 0 } },
+ { "NIKON", "D800", DirectSunlight, 0, { 1.972656, 1, 1.375000, 0 } },
+ { "NIKON", "D800", Flash, 0, { 2.187500, 1, 1.207031, 0 } },
+ { "NIKON", "D800", Cloudy, 0, { 2.101563, 1, 1.253906, 0 } },
+ { "NIKON", "D800", Shade, 0, { 2.378906, 1, 1.128906, 0 } },
+
{ "NIKON", "D40", Incandescent, -3, { 1.492188, 1, 2.164063, 0 } },
{ "NIKON", "D40", Incandescent, -2, { 1.437500, 1, 2.367188, 0 } },
{ "NIKON", "D40", Incandescent, -1, { 1.417969, 1, 2.414062, 0 } },

0 comments on commit 5a7b42c

Please sign in to comment.