diff options
| author | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2008-07-05 23:02:19 +0200 |
|---|---|---|
| committer | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2008-07-05 23:02:19 +0200 |
| commit | 5e981a4ecb4b1a2c9f575a51e3c1a6a7ba98a7cc (patch) | |
| tree | 9bc7ce93a101db90be3c9de38c8c06421aa89967 /src/Stitch.cxx | |
| parent | 84802dd00c14ac98164fc9a7bfa1990cbf36d91c (diff) | |
fix PreviewOutputImage
Diffstat (limited to 'src/Stitch.cxx')
| -rw-r--r-- | src/Stitch.cxx | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/src/Stitch.cxx b/src/Stitch.cxx index 65a838e..3aefb20 100644 --- a/src/Stitch.cxx +++ b/src/Stitch.cxx @@ -98,15 +98,14 @@ Stitch::resample(GipfelWidget::sample_mode_t m, int merged_pixel_set; double radius = (double) w / (view_end -view_start); - if (merged_image) { - merged_image->init(w, h); - } + if (merged_image) + if (merged_image->init(w, h) != 0) + merged_image = NULL; - for (int i=0; i<MAX_PICS; i++) { - if (single_images[i]) { - single_images[i]->init(w, h); - } - } + for (int i=0; i<MAX_PICS; i++) + if (single_images[i]) + if (single_images[i]->init(w, h) != 0) + single_images[i] = NULL; for (int y = 0; y < h; y++) { double a_nick = atan((double)(y_off - y)/radius); @@ -146,14 +145,12 @@ Stitch::resample(GipfelWidget::sample_mode_t m, } } - if (merged_image) { + if (merged_image) merged_image->done(); - } - for (int i=0; i<MAX_PICS; i++) { - if (single_images[i]) { + + for (int i=0; i<MAX_PICS; i++) + if (single_images[i]) single_images[i]->done(); - } - } return 0; } |