cpl_apertures-test.c   cpl_apertures-test.c 
/* $Id: cpl_apertures-test.c,v 1.39 2011/12/20 11:06:30 llundin Exp $ /* $Id: cpl_apertures-test.c,v 1.41 2012/04/04 12:05:51 llundin Exp $
* *
* This file is part of the ESO Common Pipeline Library * This file is part of the ESO Common Pipeline Library
* Copyright (C) 2001-2008 European Southern Observatory * Copyright (C) 2001-2008 European Southern Observatory
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
skipping to change at line 23 skipping to change at line 23
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
*/ */
/* /*
* $Author: llundin $ * $Author: llundin $
* $Date: 2011/12/20 11:06:30 $ * $Date: 2012/04/04 12:05:51 $
* $Revision: 1.39 $ * $Revision: 1.41 $
* $Name: cpl-6_0 $ * $Name: cpl-6_1 $
*/ */
/*------------------------------------------------------------------------- ---- /*------------------------------------------------------------------------- ----
Includes Includes
-------------------------------------------------------------------------- ---*/ -------------------------------------------------------------------------- ---*/
#include <math.h> #include <math.h>
#include <cpl_image_gen.h> #include <cpl_image_gen.h>
#include <cpl_image_io.h> #include <cpl_image_io.h>
skipping to change at line 194 skipping to change at line 194
val[55] = maxval; val[55] = maxval;
val[63] = val[64] = val[65] = val[66] = 1.0; val[63] = val[64] = val[65] = val[66] = 1.0;
val[88] = 2.0 * maxval; val[88] = 2.0 * maxval;
bpm = cpl_mask_threshold_image_create(imd, 0.5, 0.5 + maxval); bpm = cpl_mask_threshold_image_create(imd, 0.5, 0.5 + maxval);
error = cpl_mask_not(bpm); error = cpl_mask_not(bpm);
cpl_test_eq_error(error, CPL_ERROR_NONE); cpl_test_eq_error(error, CPL_ERROR_NONE);
for (itype = 0; itype < sizeof(img_type)/sizeof(img_type[0]); itype++) { for (itype = 0; itype < sizeof(img_type)/sizeof(img_type[0]); itype++) {
const cpl_size naperts = 2; const cpl_size naperts = 2;
const cpl_type type = img_type[itype];
cpl_image * labels = cpl_image_new(IMAGESZ, IMAGESZ, CPL_TYPE_INT); cpl_image * labels = cpl_image_new(IMAGESZ, IMAGESZ, CPL_TYPE_INT);
cpl_image * img = cpl_image_cast(imd, img_type[itype]); cpl_image * img = cpl_image_cast(imd, type);
cpl_image * imb = cpl_image_duplicate(img); cpl_image * imb = cpl_image_duplicate(img);
cpl_mask * bin; cpl_mask * bin;
cpl_size xpos, ypos; cpl_size xpos, ypos;
error = cpl_image_reject_from_mask(imb, bpm); error = cpl_image_reject_from_mask(imb, bpm);
cpl_test_eq_error(error, CPL_ERROR_NONE); cpl_test_eq_error(error, CPL_ERROR_NONE);
/* Create test image and the labels */ /* Create test image and the labels */
cpl_msg_info(cpl_func, "Testing with a %d X %d %s-image", cpl_msg_info(cpl_func, "Testing with a %d X %d %s-image",
IMAGESZ, IMAGESZ, cpl_type_get_name(img_type[itype])); IMAGESZ, IMAGESZ, cpl_type_get_name(type));
/* Test 3: with a 'bad' label image */ /* Test 3: with a 'bad' label image */
nullapert = cpl_apertures_new_from_image(img, NULL); nullapert = cpl_apertures_new_from_image(img, NULL);
cpl_test_error(CPL_ERROR_NULL_INPUT); cpl_test_error(CPL_ERROR_NULL_INPUT);
cpl_test_null(nullapert); cpl_test_null(nullapert);
cpl_test_nonnull(labels); cpl_test_nonnull(labels);
nullapert = cpl_apertures_new_from_image(img, labels); nullapert = cpl_apertures_new_from_image(img, labels);
cpl_test_error(CPL_ERROR_ILLEGAL_INPUT); cpl_test_error(CPL_ERROR_ILLEGAL_INPUT);
skipping to change at line 233 skipping to change at line 234
cpl_test_nonnull(aperts); cpl_test_nonnull(aperts);
cpl_apertures_test_one(aperts, stream); cpl_apertures_test_one(aperts, stream);
nsize = cpl_apertures_get_size(aperts); nsize = cpl_apertures_get_size(aperts);
cpl_test_error(CPL_ERROR_NONE); cpl_test_error(CPL_ERROR_NONE);
cpl_test_eq(nsize, 1); cpl_test_eq(nsize, 1);
cpl_apertures_delete(aperts); cpl_apertures_delete(aperts);
if (type != CPL_TYPE_INT) {
/* Test (error) handling of a complex image */
cpl_image * imgc = cpl_image_cast(imd, type | CPL_TYPE_COMPLEX)
;
aperts = cpl_apertures_new_from_image(imgc, labels);
cpl_test_error(CPL_ERROR_TYPE_MISMATCH);
cpl_test_null(aperts);
cpl_image_delete(imgc);
}
/* Test other error handling */
error = cpl_image_set(labels, 1, 1, 2.0); error = cpl_image_set(labels, 1, 1, 2.0);
cpl_test_eq_error(error, CPL_ERROR_NONE); cpl_test_eq_error(error, CPL_ERROR_NONE);
aperts = cpl_apertures_new_from_image(img, labels); aperts = cpl_apertures_new_from_image(img, labels);
cpl_test_error(CPL_ERROR_DATA_NOT_FOUND); cpl_test_error(CPL_ERROR_DATA_NOT_FOUND);
cpl_test_null(aperts); cpl_test_null(aperts);
cpl_image_delete(labels); cpl_image_delete(labels);
/* Test 4: Thresholding */ /* Test 4: Thresholding */
skipping to change at line 408 skipping to change at line 420
/* Test cpl_apertures_extract() */ /* Test cpl_apertures_extract() */
cpl_msg_info("","Test the apertures detection with a thresholding metho d"); cpl_msg_info("","Test the apertures detection with a thresholding metho d");
aperts = cpl_apertures_extract(imd, sigmas, &pos); aperts = cpl_apertures_extract(imd, sigmas, &pos);
cpl_test_error(CPL_ERROR_NONE); cpl_test_error(CPL_ERROR_NONE);
cpl_test_nonnull(aperts); cpl_test_nonnull(aperts);
cpl_apertures_test_one(aperts, stream); cpl_apertures_test_one(aperts, stream);
cpl_apertures_delete(aperts); cpl_apertures_delete(aperts);
/* Test error handling of cpl_apertures_extract_sigma() */
nullapert = cpl_apertures_extract_sigma(imd, 100.0);
cpl_test_error(CPL_ERROR_DATA_NOT_FOUND);
cpl_test_null(nullapert);
/* Test error handling of cpl_apertures_extract_mask() */
nullapert = cpl_apertures_extract_mask(imd, NULL);
cpl_test_error(CPL_ERROR_NULL_INPUT);
cpl_test_null(nullapert);
cpl_mask_delete(bpm);
bpm = cpl_mask_new(IMAGESZ2, IMAGESZ2);
nullapert = cpl_apertures_extract_mask(imd, bpm);
cpl_test_error(CPL_ERROR_DATA_NOT_FOUND);
cpl_test_null(nullapert);
/* Test cpl_apertures_extract_window() */ /* Test cpl_apertures_extract_window() */
cpl_msg_info("","Test the apertures detection (threshold) on a zone"); cpl_msg_info("","Test the apertures detection (threshold) on a zone");
aperts = cpl_apertures_extract_window(imd, sigmas, IMAGESZ2/4, IMAGESZ2 /4, aperts = cpl_apertures_extract_window(imd, sigmas, IMAGESZ2/4, IMAGESZ2 /4,
3*IMAGESZ2/4, 3*IMAGESZ2/4, &pos) ; 3*IMAGESZ2/4, 3*IMAGESZ2/4, &pos) ;
cpl_test_error(CPL_ERROR_NONE); cpl_test_error(CPL_ERROR_NONE);
cpl_test_nonnull(aperts); cpl_test_nonnull(aperts);
cpl_apertures_test_one(aperts, stream); cpl_apertures_test_one(aperts, stream);
nsize = cpl_apertures_get_size(aperts); nsize = cpl_apertures_get_size(aperts);
 End of changes. 7 change blocks. 
6 lines changed or deleted 35 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/