[cpl] 01/02: Merge branch 'upstream' into debian

Ole Streicher olebole-guest at moszumanska.debian.org
Mon Mar 17 12:53:39 UTC 2014


This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl.

commit aeca3b04e2cd2970587b0ec179ceaf65dc84f081
Merge: 11db5f5 aee77f9
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Mar 17 13:39:07 2014 +0100

    Merge branch 'upstream' into debian

 COPYING                                            |    2 +-
 Makefile.am                                        |    2 +-
 Makefile.purify.in                                 |    2 +-
 NEWS                                               |   49 +-
 README                                             |    2 +-
 acinclude.m4                                       |    6 +-
 config.h.in                                        |    9 +
 configure                                          |   51 +-
 configure.ac                                       |    9 +-
 cpl.h                                              |   12 +-
 cplcore/Makefile.am                                |   12 +-
 cplcore/Makefile.in                                |   13 +-
 cplcore/cpl_array.c                                |  461 ++--
 cplcore/cpl_array.h                                |   52 +-
 cplcore/cpl_array_impl.h                           |   10 +-
 cplcore/cpl_bivector.c                             |    6 +-
 cplcore/cpl_bivector.h                             |    6 +-
 cplcore/cpl_cfitsio.c                              |  161 ++
 cplcore/cpl_cfitsio.h                              |   96 +
 cplcore/cpl_column.c                               |  285 +-
 cplcore/cpl_column.h                               |   62 +-
 cplcore/cpl_error.c                                |    6 +-
 cplcore/cpl_error.h                                |   12 +-
 cplcore/cpl_error_impl.h                           |    6 +-
 cplcore/cpl_errorstate.c                           |   77 +-
 cplcore/cpl_errorstate.h                           |    6 +-
 cplcore/cpl_filter.h                               |    6 +-
 cplcore/cpl_filter_median.c                        |    6 +-
 cplcore/cpl_fits.c                                 |   12 +-
 cplcore/cpl_fits.h                                 |    6 +-
 cplcore/cpl_image.h                                |    6 +-
 cplcore/cpl_image_basic.c                          |  795 +++++-
 cplcore/cpl_image_basic.h                          |   35 +-
 cplcore/cpl_image_basic_body.h                     |  226 +-
 ...pl_polynomial_impl.h => cpl_image_basic_impl.h} |   37 +-
 cplcore/cpl_image_bpm.c                            |    9 +-
 cplcore/cpl_image_bpm.h                            |   12 +-
 cplcore/cpl_image_bpm_body.h                       |    4 +-
 cplcore/cpl_image_defs.h                           |    6 +-
 cplcore/cpl_image_filter.c                         |    6 +-
 cplcore/cpl_image_filter.h                         |    6 +-
 cplcore/cpl_image_filter_body.h                    |    2 +-
 cplcore/cpl_image_filter_impl.h                    |    6 +-
 cplcore/cpl_image_gen.c                            |    6 +-
 cplcore/cpl_image_gen.h                            |    6 +-
 cplcore/cpl_image_gen_body.h                       |    2 +-
 cplcore/cpl_image_io.c                             |  219 +-
 cplcore/cpl_image_io.h                             |   27 +-
 cplcore/cpl_image_io_body.h                        |    4 +-
 cplcore/cpl_image_io_impl.h                        |   10 +-
 cplcore/cpl_image_iqe.c                            |    6 +-
 cplcore/cpl_image_iqe.h                            |    6 +-
 cplcore/cpl_image_resample.c                       |    6 +-
 cplcore/cpl_image_resample.h                       |    6 +-
 cplcore/cpl_image_resample_body.h                  |   30 +-
 cplcore/cpl_image_stats.c                          |    6 +-
 cplcore/cpl_image_stats.h                          |    6 +-
 cplcore/cpl_image_stats_body.h                     |    2 +-
 cplcore/cpl_imagelist.h                            |    6 +-
 cplcore/cpl_imagelist_basic.c                      |    6 +-
 cplcore/cpl_imagelist_basic.h                      |    6 +-
 cplcore/cpl_imagelist_basic_body.h                 |    6 +-
 cplcore/cpl_imagelist_defs.h                       |    6 +-
 cplcore/cpl_imagelist_io.c                         |   10 +-
 cplcore/cpl_imagelist_io.h                         |    6 +-
 cplcore/cpl_init.c                                 |   10 +-
 cplcore/cpl_init.h                                 |    6 +-
 cplcore/cpl_io.h                                   |    6 +-
 cplcore/cpl_io_fits.c                              |    6 +-
 cplcore/cpl_io_fits.h                              |    6 +-
 cplcore/cpl_macros.h                               |   35 +-
 cplcore/cpl_mask.c                                 |  222 +-
 cplcore/cpl_mask.h                                 |    6 +-
 cplcore/cpl_mask_binary.h                          |  156 ++
 cplcore/cpl_mask_body.h                            |    2 +-
 cplcore/{cpl_image_iqe.h => cpl_mask_defs.h}       |   29 +-
 cplcore/cpl_mask_impl.h                            |   66 +-
 cplcore/cpl_math_const.h                           |   36 +-
 cplcore/cpl_matrix.c                               |  165 +-
 cplcore/cpl_matrix.h                               |    6 +-
 cplcore/cpl_matrix_impl.h                          |   11 +-
 cplcore/cpl_memory.c                               |    6 +-
 cplcore/cpl_memory.h                               |    6 +-
 cplcore/cpl_memory_impl.h                          |    6 +-
 cplcore/cpl_msg.c                                  |   52 +-
 cplcore/cpl_msg.h                                  |    6 +-
 cplcore/cpl_plot.c                                 |   38 +-
 cplcore/cpl_plot.h                                 |    6 +-
 cplcore/cpl_polynomial.c                           |   39 +-
 cplcore/cpl_polynomial.h                           |    6 +-
 cplcore/cpl_polynomial_impl.h                      |    6 +-
 cplcore/cpl_property.c                             |    6 +-
 cplcore/cpl_property.h                             |   14 +-
 cplcore/cpl_propertylist.c                         |   29 +-
 cplcore/cpl_propertylist.h                         |   34 +-
 cplcore/cpl_propertylist_impl.h                    |    6 +-
 cplcore/cpl_stats.c                                |    6 +-
 cplcore/cpl_stats.h                                |    6 +-
 cplcore/cpl_stats_body.h                           |    2 +-
 cplcore/cpl_table.c                                | 2708 ++++++--------------
 cplcore/cpl_table.h                                |   64 +-
 cplcore/cpl_test.c                                 |  293 ++-
 cplcore/cpl_test.h                                 |   55 +-
 cplcore/cpl_tools.c                                |    6 +-
 cplcore/cpl_tools.h                                |   33 +-
 cplcore/cpl_tools_body.h                           |  132 +-
 cplcore/cpl_type.c                                 |    6 +-
 cplcore/cpl_type.h                                 |   26 +-
 cplcore/cpl_type_impl.h                            |    6 +-
 cplcore/cpl_vector.c                               |   59 +-
 cplcore/cpl_vector.h                               |    6 +-
 cplcore/cpl_vector_fit_impl.h                      |  100 +-
 cplcore/cpl_vector_impl.h                          |    6 +-
 cplcore/cpl_version.c                              |    6 +-
 cplcore/cpl_xmemory.c                              |    6 +-
 cplcore/cpl_xmemory.h                              |    6 +-
 cplcore/tests/Makefile.am                          |    2 +-
 cplcore/tests/cpl_bivector-test.c                  |    6 +-
 cplcore/tests/cpl_error-test.c                     |   10 +-
 cplcore/tests/cpl_errorstate-test.c                |    6 +-
 cplcore/tests/cpl_filter-test.c                    |    6 +-
 cplcore/tests/cpl_filter_body.h                    |    6 +-
 cplcore/tests/cpl_fits-test.c                      |    6 +-
 cplcore/tests/cpl_image_basic-test.c               |  400 ++-
 cplcore/tests/cpl_image_bpm-test.c                 |   73 +-
 cplcore/tests/cpl_image_filter-test.c              |    6 +-
 cplcore/tests/cpl_image_gen-test.c                 |    6 +-
 cplcore/tests/cpl_image_io-test.c                  |    6 +-
 cplcore/tests/cpl_image_iqe-test.c                 |    6 +-
 cplcore/tests/cpl_image_resample-test.c            |    6 +-
 cplcore/tests/cpl_imagelist_basic-test.c           |   45 +-
 cplcore/tests/cpl_imagelist_io-test.c              |   18 +-
 cplcore/tests/cpl_io_fits-test.c                   |    6 +-
 cplcore/tests/cpl_mask-test.c                      |   56 +-
 cplcore/tests/cpl_math-test.c                      |   11 +-
 cplcore/tests/cpl_matrix-test.c                    |   35 +-
 cplcore/tests/cpl_memory-test.c                    |    6 +-
 cplcore/tests/cpl_msg-test.c                       |   36 +-
 cplcore/tests/cpl_plot-test.c                      |    6 +-
 cplcore/tests/cpl_polynomial-test.c                |    6 +-
 cplcore/tests/cpl_property-test.c                  |    6 +-
 cplcore/tests/cpl_propertylist-test.c              |    6 +-
 cplcore/tests/cpl_stats-test.c                     |    6 +-
 cplcore/tests/cpl_table-test.c                     |  558 ++--
 cplcore/tests/cpl_test-test.c                      |   73 +-
 cplcore/tests/cpl_test_init-test.c                 |    6 +-
 cplcore/tests/cpl_tools-test.c                     |    6 +-
 cplcore/tests/cpl_type-test.c                      |    6 +-
 cplcore/tests/cpl_vector-test.c                    |    9 +-
 cpldfs/Makefile.am                                 |    7 +-
 cpldfs/Makefile.in                                 |    5 +-
 cpldfs/cpl_dfs.c                                   |  212 +-
 cpldfs/cpl_dfs.h                                   |    6 +-
 cpldfs/md5.c                                       |   60 +-
 cpldfs/md5.h                                       |   19 +-
 cpldfs/tests/Makefile.am                           |    2 +-
 cpldfs/tests/cpl_dfs-test.c                        |  111 +-
 cpldrs/Makefile.am                                 |    2 +-
 cpldrs/cpl_apertures.c                             |    8 +-
 cpldrs/cpl_apertures.h                             |    6 +-
 cpldrs/cpl_apertures_img.h                         |    6 +-
 cpldrs/cpl_detector.c                              |   69 +-
 cpldrs/cpl_detector.h                              |    6 +-
 cpldrs/cpl_detector_body.h                         |    2 +-
 cpldrs/cpl_fft.c                                   |    2 +-
 cpldrs/cpl_fft.h                                   |    2 +-
 cpldrs/cpl_fft_body.h                              |    2 +-
 cpldrs/cpl_fit.c                                   |   61 +-
 cpldrs/cpl_fit.h                                   |    7 +-
 cpldrs/cpl_fit_body.h                              |    2 +-
 cpldrs/cpl_geom_img.c                              |    6 +-
 cpldrs/cpl_geom_img.h                              |    6 +-
 cpldrs/cpl_geom_img_body.h                         |    2 +-
 cpldrs/cpl_photom.c                                |    6 +-
 cpldrs/cpl_photom.h                                |    6 +-
 cpldrs/cpl_phys_const.h                            |    6 +-
 cpldrs/cpl_ppm.c                                   |    6 +-
 cpldrs/cpl_ppm.h                                   |    6 +-
 cpldrs/cpl_wcs.c                                   |  256 +-
 cpldrs/cpl_wcs.h                                   |   12 +-
 cpldrs/cpl_wlcalib.c                               |   12 +-
 cpldrs/cpl_wlcalib.h                               |   12 +-
 cpldrs/cpl_wlcalib_impl.h                          |    6 +-
 cpldrs/tests/Makefile.am                           |    2 +-
 cpldrs/tests/cpl_apertures-test.c                  |    6 +-
 cpldrs/tests/cpl_detector-test.c                   |    6 +-
 cpldrs/tests/cpl_fft-test.c                        |  205 +-
 cpldrs/tests/cpl_fit-test.c                        |   48 +-
 cpldrs/tests/cpl_geom_img-test.c                   |    6 +-
 cpldrs/tests/cpl_photom-test.c                     |    6 +-
 cpldrs/tests/cpl_ppm-test.c                        |    6 +-
 cpldrs/tests/cpl_wcs-test.c                        |    6 +-
 cpldrs/tests/cpl_wlcalib-test.c                    |    6 +-
 cpljava/Makefile.am                                |    2 +-
 cpljava/cpl_gasgano.c                              |   17 +-
 cplui/Makefile.am                                  |    2 +-
 cplui/cpl_frame.c                                  |    6 +-
 cplui/cpl_frame.h                                  |    6 +-
 cplui/cpl_frame_impl.h                             |    6 +-
 cplui/cpl_framedata.c                              |    6 +-
 cplui/cpl_framedata.h                              |    6 +-
 cplui/cpl_frameset.c                               |  864 ++++++-
 cplui/cpl_frameset.h                               |   74 +-
 cplui/cpl_frameset_io.c                            |   41 +-
 cplui/cpl_frameset_io.h                            |    6 +-
 cplui/cpl_parameter.c                              |    6 +-
 cplui/cpl_parameter.h                              |    6 +-
 cplui/cpl_parameterlist.c                          |    8 +-
 cplui/cpl_parameterlist.h                          |    6 +-
 cplui/cpl_plugin.c                                 |    6 +-
 cplui/cpl_plugin.h                                 |    6 +-
 cplui/cpl_plugininfo.h                             |    6 +-
 cplui/cpl_pluginlist.c                             |    6 +-
 cplui/cpl_pluginlist.h                             |    6 +-
 cplui/cpl_recipe.h                                 |    6 +-
 cplui/cpl_recipeconfig.c                           |    6 +-
 cplui/cpl_recipeconfig.h                           |    6 +-
 cplui/cpl_recipedefine.c                           |    6 +-
 cplui/cpl_recipedefine.h                           |   12 +-
 cplui/tests/Makefile.am                            |    2 +-
 cplui/tests/cpl_frame-test.c                       |    6 +-
 cplui/tests/cpl_framedata-test.c                   |    6 +-
 cplui/tests/cpl_frameset-test.c                    |   72 +-
 cplui/tests/cpl_frameset_io-test.c                 |   12 +-
 cplui/tests/cpl_parameter-test.c                   |    6 +-
 cplui/tests/cpl_parameterlist-test.c               |   39 +-
 cplui/tests/cpl_plugin-test.c                      |    6 +-
 cplui/tests/cpl_pluginlist-test.c                  |    6 +-
 cplui/tests/cpl_recipeconfig-test.c                |    6 +-
 cplui/tests/cpl_recipedefine-test.c                |    6 +-
 html/annotated.html                                |    2 +-
 html/classes.html                                  |    2 +-
 html/deprecated.html                               |   30 +-
 html/dir_0893a83ae506d6342ff4de074eaf5145.html     |    2 +-
 html/dir_283883d147ab9a845d7032d17e09a122.html     |    2 +-
 html/dir_5cd28bf58103222faf21a5533c3a1fe9.html     |    2 +-
 html/dir_d94ae846f16019cf15b4979bbb4258a2.html     |   12 +-
 html/form_0.png                                    |  Bin 1311 -> 1309 bytes
 html/form_1.png                                    |  Bin 1139 -> 1096 bytes
 html/form_10.png                                   |  Bin 211 -> 210 bytes
 html/form_11.png                                   |  Bin 295 -> 295 bytes
 html/form_12.png                                   |  Bin 307 -> 308 bytes
 html/form_13.png                                   |  Bin 279 -> 277 bytes
 html/form_14.png                                   |  Bin 312 -> 312 bytes
 html/form_15.png                                   |  Bin 529 -> 522 bytes
 html/form_16.png                                   |  Bin 301 -> 302 bytes
 html/form_17.png                                   |  Bin 214 -> 214 bytes
 html/form_18.png                                   |  Bin 567 -> 564 bytes
 html/form_19.png                                   |  Bin 368 -> 367 bytes
 html/form_2.png                                    |  Bin 242 -> 242 bytes
 html/form_20.png                                   |  Bin 864 -> 869 bytes
 html/form_21.png                                   |  Bin 558 -> 566 bytes
 html/form_23.png                                   |  Bin 849 -> 848 bytes
 html/form_24.png                                   |  Bin 345 -> 346 bytes
 html/form_25.png                                   |  Bin 214 -> 214 bytes
 html/form_3.png                                    |  Bin 3075 -> 3074 bytes
 html/form_4.png                                    |  Bin 223 -> 223 bytes
 html/form_5.png                                    |  Bin 220 -> 220 bytes
 html/form_6.png                                    |  Bin 2974 -> 2948 bytes
 html/form_7.png                                    |  Bin 261 -> 261 bytes
 html/form_9.png                                    |  Bin 3940 -> 3945 bytes
 html/functions.html                                |    2 +-
 html/functions_vars.html                           |    2 +-
 html/group__cpl__apertures.html                    |   14 +-
 html/group__cpl__array.html                        |    2 +-
 html/group__cpl__bivector.html                     |    2 +-
 html/group__cpl__detector.html                     |   12 +-
 html/group__cpl__dfs.html                          |    2 +-
 html/group__cpl__error.html                        |    2 +-
 html/group__cpl__errorstate.html                   |   41 +-
 html/group__cpl__fft.html                          |    2 +-
 html/group__cpl__filter.html                       |    2 +-
 html/group__cpl__fit.html                          |   58 +-
 html/group__cpl__fits.html                         |    4 +-
 html/group__cpl__frame.html                        |    2 +-
 html/group__cpl__framedata.html                    |    2 +-
 html/group__cpl__frameset.html                     |   21 +-
 html/group__cpl__frameset__io.html                 |    2 +-
 html/group__cpl__frameset__iterator.html           |  468 ++++
 html/group__cpl__geom__img.html                    |    2 +-
 html/group__cpl__image.html                        |  717 +++++-
 html/group__cpl__imagelist.html                    |    2 +-
 html/group__cpl__init.html                         |    2 +-
 html/group__cpl__io.html                           |    2 +-
 html/group__cpl__mask.html                         |   18 +-
 html/group__cpl__math.html                         |   82 +-
 html/group__cpl__matrix.html                       |   14 +-
 html/group__cpl__memory.html                       |    2 +-
 html/group__cpl__msg.html                          |    2 +-
 html/group__cpl__parameter.html                    |    2 +-
 html/group__cpl__parameterlist.html                |    2 +-
 html/group__cpl__photom.html                       |    2 +-
 html/group__cpl__plot.html                         |    2 +-
 html/group__cpl__plugin.html                       |    2 +-
 html/group__cpl__pluginlist.html                   |    2 +-
 html/group__cpl__polynomial.html                   |    6 +-
 html/group__cpl__ppm.html                          |    2 +-
 html/group__cpl__property.html                     |    2 +-
 html/group__cpl__propertylist.html                 |    2 +-
 html/group__cpl__recipe.html                       |    2 +-
 html/group__cpl__recipeconfig.html                 |    2 +-
 html/group__cpl__recipedefine.html                 |    4 +-
 html/group__cpl__stats.html                        |    2 +-
 html/group__cpl__table.html                        |    4 +-
 html/group__cpl__test.html                         |   70 +-
 html/group__cpl__type.html                         |   25 +-
 html/group__cpl__vector.html                       |    6 +-
 html/group__cpl__version.html                      |    2 +-
 html/group__cpl__wcs.html                          |   84 +-
 html/group__cpl__wlcalib.html                      |    2 +-
 html/index.html                                    |    2 +-
 html/modules.html                                  |   81 +-
 html/pages.html                                    |    2 +-
 html/struct__cpl__framedata__-members.html         |    2 +-
 html/struct__cpl__framedata__.html                 |    2 +-
 html/struct__cpl__plugin__-members.html            |    2 +-
 html/struct__cpl__plugin__.html                    |    2 +-
 html/struct__cpl__recipe__-members.html            |    2 +-
 html/struct__cpl__recipe__.html                    |    2 +-
 libcext/Makefile.purify.in                         |    2 +-
 libcext/cext/cxdeque.c                             |    9 +-
 libcext/cext/cxdeque.h                             |    6 +-
 libcext/cext/cxfileutils.c                         |    6 +-
 libcext/cext/cxfileutils.h                         |    6 +-
 libcext/cext/cxlist.c                              |   12 +-
 libcext/cext/cxlist.h                              |    6 +-
 libcext/cext/cxmacros.h                            |    6 +-
 libcext/cext/cxmap.c                               |    6 +-
 libcext/cext/cxmap.h                               |    6 +-
 libcext/cext/cxmemory.c                            |    6 +-
 libcext/cext/cxmemory.h                            |    6 +-
 libcext/cext/cxmessages.c                          |    8 +-
 libcext/cext/cxmessages.h                          |    6 +-
 libcext/cext/cxmultimap.c                          |    6 +-
 libcext/cext/cxmultimap.h                          |    6 +-
 libcext/cext/cxslist.c                             |   12 +-
 libcext/cext/cxslist.h                             |    6 +-
 libcext/cext/cxstring.c                            |    6 +-
 libcext/cext/cxstring.h                            |    6 +-
 libcext/cext/cxstrutils.c                          |    6 +-
 libcext/cext/cxstrutils.h                          |    6 +-
 libcext/cext/cxtree.c                              |   10 +-
 libcext/cext/cxtree.h                              |    6 +-
 libcext/cext/cxtypes.h                             |    2 +-
 libcext/cext/cxutils.c                             |    7 +-
 libcext/cext/cxutils.h                             |    6 +-
 libcext/cext/snprintf.c                            |    2 +-
 libcext/cext/snprintf.h                            |    2 +-
 libcext/html/cxdeque_8h_source.html                |    6 +-
 libcext/html/cxfileutils_8h_source.html            |    6 +-
 libcext/html/cxlist_8h_source.html                 |    6 +-
 libcext/html/cxmacros_8h_source.html               |    6 +-
 libcext/html/cxmap_8h_source.html                  |    6 +-
 libcext/html/cxmemory_8h_source.html               |    6 +-
 libcext/html/cxmessages_8h_source.html             |    6 +-
 libcext/html/cxmultimap_8h_source.html             |    6 +-
 libcext/html/cxslist_8h_source.html                |    6 +-
 libcext/html/cxstring_8h_source.html               |    6 +-
 libcext/html/cxstrutils_8h_source.html             |    6 +-
 libcext/html/cxtree_8h_source.html                 |    6 +-
 libcext/html/cxtypes_8h_source.html                |    2 +-
 libcext/html/cxutils_8h_source.html                |    6 +-
 libcext/html/snprintf_8h_source.html               |    2 +-
 libcext/m4/eso.m4                                  |   11 +
 libcext/tests/cxdeque-test.c                       |    6 +-
 libcext/tests/cxlist-test.c                        |    6 +-
 libcext/tests/cxmap-test.c                         |    6 +-
 libcext/tests/cxslist-test.c                       |    6 +-
 libcext/tests/cxstring-test.c                      |    6 +-
 libcext/tests/cxtree-test.c                        |    6 +-
 libcext/tests/cxtypes-test.c                       |    6 +-
 m4/eso.m4                                          |   11 +
 372 files changed, 9205 insertions(+), 4500 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl.git



More information about the debian-science-commits mailing list