Mercurial > mxe-octave
annotate src/of-fits-3-octave-9-compat.patch @ 7207:9ed6500e56d3 default tip @
maint: Merge release to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Fri, 17 May 2024 20:16:41 +0200 |
parents | 297b371a6713 |
children |
rev | line source |
---|---|
6531
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
1 Replace "fortran_vec" on const objects with "data". |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
2 Casting away const is ok here. The pointers are only passed to functions that |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
3 don't modify the data afaict. |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
4 |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
5 --- fits-1.0.7/src/save_fits_image.cc.orig 2022-11-17 11:09:21.875653000 +0100 |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
6 +++ fits-1.0.7/src/save_fits_image.cc 2022-11-18 17:04:28.843175674 +0100 |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
7 @@ -129,7 +129,7 @@ |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
8 return octave_value_list(); |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
9 } |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
10 |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
11 - double * datap = const_cast<double*>( image.fortran_vec() ); |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
12 + double * datap = const_cast<double *> ( image.data () ); |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
13 if( fits_write_img( fp, TDOUBLE, fpixel, len, datap , &status ) > 0 ) |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
14 { |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
15 fprintf( stderr, "Could not write image data.\n" ); |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
16 |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
17 --- fits-1.0.7/src/save_fits_image_multi_ext.cc.orig 2022-11-17 11:09:21.875653000 +0100 |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
18 +++ fits-1.0.7/src/save_fits_image_multi_ext.cc 2022-11-18 17:21:18.905761447 +0100 |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
19 @@ -137,7 +137,7 @@ |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
20 fits_report_error( stderr, status ); |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
21 return octave_value_list(); |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
22 } |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
23 - double * datap = const_cast<double*>( image.fortran_vec() ); |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
24 + double * datap = const_cast<double *> ( image.data () ); |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
25 if( fits_write_img( fp, TDOUBLE, fpixel, sz_axes[0]*sz_axes[1], datap + i*sz_axes[0]*sz_axes[1], &status ) > 0 ) |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
26 { |
297b371a6713
of-fits: Fix compatibility with Octave 9.
Markus Mützel <markus.muetzel@gmx.de>
parents:
diff
changeset
|
27 fprintf( stderr, "Could not write image data.\n" ); |