Changeset 4128
- Timestamp:
- Jun 6, 2005, 4:29:44 PM (21 years ago)
- Location:
- trunk/psLib
- Files:
-
- 3 deleted
- 24 edited
-
configure.ac (modified) (1 diff)
-
pslib.kdevelop.pcs (modified) ( previous)
-
pslib.kdevses (modified) (1 diff)
-
src/dataIO/psDB.c (modified) (2 diffs)
-
src/dataIO/psDB.h (modified) (4 diffs)
-
src/dataManip/psMinimize.c (modified) (2 diffs)
-
src/db/psDB.c (modified) (2 diffs)
-
src/db/psDB.h (modified) (4 diffs)
-
src/fft/psImageFFT.c (modified) (2 diffs)
-
src/image/Makefile.am (modified) (2 diffs)
-
src/image/image.i (modified) (1 diff)
-
src/image/psImage.c (modified) (2 diffs)
-
src/image/psImage.h (modified) (2 diffs)
-
src/image/psImageConvolve.c (modified) (2 diffs)
-
src/image/psImageFFT.c (modified) (2 diffs)
-
src/image/psImageIO.c (deleted)
-
src/image/psImageIO.h (deleted)
-
src/imageops/psImageConvolve.c (modified) (2 diffs)
-
src/math/psMinimize.c (modified) (2 diffs)
-
src/mathtypes/psImage.c (modified) (2 diffs)
-
src/mathtypes/psImage.h (modified) (2 diffs)
-
src/pslib_strict.h (modified) (2 diffs)
-
test/dataIO/verified/tst_psDB.stderr (modified) (1 diff)
-
test/image/Makefile.am (modified) (1 diff)
-
test/image/tst_psImageGeomManip.c (modified) (4 diffs)
-
test/image/tst_psImageIO.c (deleted)
-
test/image/verified/tst_psImageGeomManip.stderr (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/configure.ac
r3889 r4128 119 119 ]])], [], [AC_MSG_ERROR([MySQL 4.1.2 or newer is required. Obtain it at http://www.mysql.com or use --with-mysql to specify location.])]) 120 120 121 CFLAGS="${CFLAGS=} -DBUILD_PSDB"122 PSLIB_CFLAGS="${PSLIB_CFLAGS=} -DBUILD_PSDB"123 121 else 122 CFLAGS="${CFLAGS=} -DOMIT_PSDB" 123 PSLIB_CFLAGS="${PSLIB_CFLAGS=} -DOMIT_PSDB" 124 124 AC_MSG_RESULT([disable building MySQL functionality]) 125 125 fi -
trunk/psLib/pslib.kdevses
r3978 r4128 2 2 <!DOCTYPE KDevPrjSession> 3 3 <KDevPrjSession> 4 <DocsAndViews NumberOfDocuments=" 8" >4 <DocsAndViews NumberOfDocuments="6" > 5 5 <Doc0 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/collections/tst_psPixels.c" > 6 6 <View0 line="329" Type="Source" /> 7 7 </Doc0> 8 <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/ test/astronomy/tst_psAstrometry01.c" >9 <View0 line=" 982" Type="Source" />8 <Doc1 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/image/psImagePixelManip.c" > 9 <View0 line="353" Type="Source" /> 10 10 </Doc1> 11 <Doc2 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/ test/image/tst_psImage.c" >12 <View0 line=" 28" Type="Source" />11 <Doc2 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/image/psImageErrors.dat" > 12 <View0 line="0" Type="Source" /> 13 13 </Doc2> 14 <Doc3 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/ test/image/tst_psImageStructManip.c" >15 <View0 line=" 47" Type="Source" />14 <Doc3 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/astronomy/psCoord.h" > 15 <View0 line="386" Type="Source" /> 16 16 </Doc3> 17 <Doc4 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/ test/image/tst_psImageConvolve.c" >18 <View0 line=" 435" Type="Source" />17 <Doc4 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/astronomy/psCoord.c" > 18 <View0 line="1175" Type="Source" /> 19 19 </Doc4> 20 <Doc5 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/ src/image/psImageConvolve.c" >21 <View0 line=" 456" Type="Source" />20 <Doc5 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/autogen.sh" > 21 <View0 line="95" Type="Source" /> 22 22 </Doc5> 23 <Doc6 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/src/dataIO/psFits.c" >24 <View0 line="627" Type="Source" />25 </Doc6>26 <Doc7 NumberOfViews="1" URL="file:///home/desonia/panstarrs/psLib/test/image/tst_psImageStats.c" >27 <View0 line="114" Type="Source" />28 </Doc7>29 23 </DocsAndViews> 30 24 <pluginList> -
trunk/psLib/src/dataIO/psDB.c
r4106 r4128 12 12 * @author Joshua Hoblitt 13 13 * 14 * @version $Revision: 1.2 0$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06-0 3 23:48:38$14 * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-07 02:29:44 $ 16 16 * 17 17 * Copyright 2005 Joshua Hoblitt, University of Hawaii 18 18 */ 19 19 20 #if def BUILD_PSDB20 #ifndef OMIT_PSDB 21 21 22 22 #include <stdio.h> … … 1623 1623 } 1624 1624 1625 #endif // BUILD_PSDB1625 #endif // OMIT_PSDB -
trunk/psLib/src/dataIO/psDB.h
r3957 r4128 10 10 * @author Joshua Hoblitt 11 11 * 12 * @version $Revision: 1. 6$ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 5-18 00:55:36$12 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-06-07 02:29:44 $ 14 14 * 15 15 * Copyright 2005 Joshua Hoblitt, University of Hawaii … … 19 19 #define PS_DB_H 1 20 20 21 #if def BUILD_PSDB21 #ifndef OMIT_PSDB 22 22 23 23 #include "psType.h" … … 109 109 * string. The value of the psMetadataItem.data element is unused for the 110 110 * PS_META_PRIMITIVE types. Other psMetadata types beyond PS_META_STR and 111 * PS_META_PRIMITIVE are not allowed in a table definition. 111 * PS_META_PRIMITIVE are not allowed in a table definition. 112 112 * 113 113 * Database indexes can be specified setting the "comment" field to "Primary … … 276 276 /// @} 277 277 278 #endif // BUILD_PSDB278 #endif // OMIT_PSDB 279 279 280 280 #endif // PS_DB_H -
trunk/psLib/src/dataManip/psMinimize.c
r4029 r4128 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.12 0$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 5-25 20:26:55$11 * @version $Revision: 1.121 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-06-07 02:29:44 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 28 28 #include "psImage.h" 29 29 #include "psImageStructManip.h" 30 #include "psImageIO.h"31 30 /*****************************************************************************/ 32 31 /* DEFINE STATEMENTS */ -
trunk/psLib/src/db/psDB.c
r4106 r4128 12 12 * @author Joshua Hoblitt 13 13 * 14 * @version $Revision: 1.2 0$ $Name: not supported by cvs2svn $15 * @date $Date: 2005-06-0 3 23:48:38$14 * @version $Revision: 1.21 $ $Name: not supported by cvs2svn $ 15 * @date $Date: 2005-06-07 02:29:44 $ 16 16 * 17 17 * Copyright 2005 Joshua Hoblitt, University of Hawaii 18 18 */ 19 19 20 #if def BUILD_PSDB20 #ifndef OMIT_PSDB 21 21 22 22 #include <stdio.h> … … 1623 1623 } 1624 1624 1625 #endif // BUILD_PSDB1625 #endif // OMIT_PSDB -
trunk/psLib/src/db/psDB.h
r3957 r4128 10 10 * @author Joshua Hoblitt 11 11 * 12 * @version $Revision: 1. 6$ $Name: not supported by cvs2svn $13 * @date $Date: 2005-0 5-18 00:55:36$12 * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ 13 * @date $Date: 2005-06-07 02:29:44 $ 14 14 * 15 15 * Copyright 2005 Joshua Hoblitt, University of Hawaii … … 19 19 #define PS_DB_H 1 20 20 21 #if def BUILD_PSDB21 #ifndef OMIT_PSDB 22 22 23 23 #include "psType.h" … … 109 109 * string. The value of the psMetadataItem.data element is unused for the 110 110 * PS_META_PRIMITIVE types. Other psMetadata types beyond PS_META_STR and 111 * PS_META_PRIMITIVE are not allowed in a table definition. 111 * PS_META_PRIMITIVE are not allowed in a table definition. 112 112 * 113 113 * Database indexes can be specified setting the "comment" field to "Primary … … 276 276 /// @} 277 277 278 #endif // BUILD_PSDB278 #endif // OMIT_PSDB 279 279 280 280 #endif // PS_DB_H -
trunk/psLib/src/fft/psImageFFT.c
r3977 r4128 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.1 3$ $Name: not supported by cvs2svn $8 * @date $Date: 2005-0 5-19 05:18:20$7 * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2005-06-07 02:29:44 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 19 19 #include "psMemory.h" 20 20 #include "psLogMsg.h" 21 #include "psImageIO.h"22 21 #include "psImageStructManip.h" 23 22 -
trunk/psLib/src/image/Makefile.am
r3968 r4128 15 15 psImagePixelExtract.c \ 16 16 psImageStructManip.c \ 17 psImageIO.c \18 17 psImageGeomManip.c \ 19 18 psImagePixelManip.c \ … … 33 32 psImagePixelExtract.h \ 34 33 psImageStructManip.h \ 35 psImageIO.h \36 34 psImageGeomManip.h \ 37 35 psImagePixelManip.h \ -
trunk/psLib/src/image/image.i
r3968 r4128 6 6 %include "psImageFFT.h" 7 7 %include "psImage.h" 8 %include "psImageIO.h"9 8 %include "psImageGeomManip.h" 10 9 %include "psImagePixelManip.h" -
trunk/psLib/src/image/psImage.c
r3977 r4128 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.6 6$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 5-19 05:18:20$11 * @version $Revision: 1.67 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-06-07 02:29:44 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 352 352 353 353 return numFreed; 354 } 355 356 bool p_psImagePrint (FILE *f, psImage *a, char *name) 357 { 358 359 fprintf (f, "matrix: %s\n", name); 360 361 for (int j = 0; j < a[0].numRows; j++) { 362 for (int i = 0; i < a[0].numCols; i++) { 363 fprintf (f, "%f ", p_psImageGetElementF64(a, i, j)); 364 } 365 fprintf (f, "\n"); 366 } 367 fprintf (f, "\n"); 368 return (true); 354 369 } 355 370 -
trunk/psLib/src/image/psImage.h
r3990 r4128 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.5 3$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 5-19 23:57:37$13 * @version $Revision: 1.54 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-06-07 02:29:44 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 176 176 ); 177 177 178 /** print image pixel values. 179 * 180 * @return bool TRUE is successful, otherwise FALSE. 181 */ 182 bool p_psImagePrint( 183 FILE *f, ///< Destination stream 184 psImage *a, ///< image to print 185 char *name ///< name of the image (for title) 186 ); 187 178 188 /** Interpolate image pixel value given floating point coordinates. 179 189 * -
trunk/psLib/src/image/psImageConvolve.c
r3977 r4128 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.1 6$ $Name: not supported by cvs2svn $8 * @date $Date: 2005-0 5-19 05:18:20$7 * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2005-06-07 02:29:44 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 20 20 #include "psLogMsg.h" 21 21 #include "psError.h" 22 #include "psImageIO.h"23 22 24 23 #include "psImageErrors.h" -
trunk/psLib/src/image/psImageFFT.c
r3977 r4128 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.1 3$ $Name: not supported by cvs2svn $8 * @date $Date: 2005-0 5-19 05:18:20$7 * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2005-06-07 02:29:44 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 19 19 #include "psMemory.h" 20 20 #include "psLogMsg.h" 21 #include "psImageIO.h"22 21 #include "psImageStructManip.h" 23 22 -
trunk/psLib/src/imageops/psImageConvolve.c
r3977 r4128 5 5 * @author Robert DeSonia, MHPCC 6 6 * 7 * @version $Revision: 1.1 6$ $Name: not supported by cvs2svn $8 * @date $Date: 2005-0 5-19 05:18:20$7 * @version $Revision: 1.17 $ $Name: not supported by cvs2svn $ 8 * @date $Date: 2005-06-07 02:29:44 $ 9 9 * 10 10 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 20 20 #include "psLogMsg.h" 21 21 #include "psError.h" 22 #include "psImageIO.h"23 22 24 23 #include "psImageErrors.h" -
trunk/psLib/src/math/psMinimize.c
r4029 r4128 9 9 * @author GLG, MHPCC 10 10 * 11 * @version $Revision: 1.12 0$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 5-25 20:26:55$11 * @version $Revision: 1.121 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-06-07 02:29:44 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 28 28 #include "psImage.h" 29 29 #include "psImageStructManip.h" 30 #include "psImageIO.h"31 30 /*****************************************************************************/ 32 31 /* DEFINE STATEMENTS */ -
trunk/psLib/src/mathtypes/psImage.c
r3977 r4128 9 9 * @author Ross Harman, MHPCC 10 10 * 11 * @version $Revision: 1.6 6$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 5-19 05:18:20$11 * @version $Revision: 1.67 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-06-07 02:29:44 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 352 352 353 353 return numFreed; 354 } 355 356 bool p_psImagePrint (FILE *f, psImage *a, char *name) 357 { 358 359 fprintf (f, "matrix: %s\n", name); 360 361 for (int j = 0; j < a[0].numRows; j++) { 362 for (int i = 0; i < a[0].numCols; i++) { 363 fprintf (f, "%f ", p_psImageGetElementF64(a, i, j)); 364 } 365 fprintf (f, "\n"); 366 } 367 fprintf (f, "\n"); 368 return (true); 354 369 } 355 370 -
trunk/psLib/src/mathtypes/psImage.h
r3990 r4128 11 11 * @author Ross Harman, MHPCC 12 12 * 13 * @version $Revision: 1.5 3$ $Name: not supported by cvs2svn $14 * @date $Date: 2005-0 5-19 23:57:37$13 * @version $Revision: 1.54 $ $Name: not supported by cvs2svn $ 14 * @date $Date: 2005-06-07 02:29:44 $ 15 15 * 16 16 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 176 176 ); 177 177 178 /** print image pixel values. 179 * 180 * @return bool TRUE is successful, otherwise FALSE. 181 */ 182 bool p_psImagePrint( 183 FILE *f, ///< Destination stream 184 psImage *a, ///< image to print 185 char *name ///< name of the image (for title) 186 ); 187 178 188 /** Interpolate image pixel value given floating point coordinates. 179 189 * -
trunk/psLib/src/pslib_strict.h
r3970 r4128 9 9 * @author Eric Van Alst, MHPCC 10 10 * 11 * @version $Revision: 1. 2$ $Name: not supported by cvs2svn $12 * @date $Date: 2005-0 5-19 02:09:39$11 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 12 * @date $Date: 2005-06-07 02:29:44 $ 13 13 * 14 14 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 98 98 #include "psImageConvolve.h" 99 99 100 /// @defgroup ImageIO Image File I/O Functions101 /// @ingroup Image102 #include "psImageIO.h"103 104 100 /// @defgroup ImageStats Image Statistical Functions 105 101 /// @ingroup Image -
trunk/psLib/test/dataIO/verified/tst_psDB.stderr
r4117 r4128 290 290 psDBDumpCols shall dump all cols from a test table. 291 291 <DATE><TIME>|<HOST>|I|_print_row 292 [key_string]=[ ]292 [key_string]=[] 293 293 294 294 ---> TESTPOINT PASSED (psDB{dbDumpCols} | tst_psDB.c) -
trunk/psLib/test/image/Makefile.am
r3973 r4128 24 24 tst_psImageStructManip \ 25 25 tst_psImageConvolve \ 26 tst_psImageIO \27 26 tst_psImageInterpolate 28 27 -
trunk/psLib/test/image/tst_psImageGeomManip.c
r4069 r4128 6 6 * @author Robert DeSonia, MHPCC 7 7 * 8 * @version $Revision: 1. 2$ $Name: not supported by cvs2svn $9 * @date $Date: 2005-06-0 1 20:37:39$8 * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ 9 * @date $Date: 2005-06-07 02:29:44 $ 10 10 * 11 11 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 536 536 mkdir("temp",0777); 537 537 remove 538 ("temp/fOut.fits") 539 ; 540 remove 541 ("temp/sOut.fits") 542 ; 543 remove 544 ("temp/fBiOut.fits") 545 ; 546 remove 547 ("temp/sBiOut.fits"); 548 ; 538 ("temp/out.fits"); 549 539 psS32 index = 0; 550 540 psBool fail = false; 551 541 psF32 radianRot; 542 543 psFits* fOutFile = psFitsAlloc("temp/fOut.fits"); 544 psFits* sOutFile = psFitsAlloc("temp/sOut.fits"); 545 psFits* fBiOutFile = psFitsAlloc("temp/fBiOut.fits"); 546 psFits* sBiOutFile = psFitsAlloc("temp/sBiOut.fits"); 547 if (fOutFile == NULL ||sOutFile == NULL || fBiOutFile == NULL || sBiOutFile == NULL) { 548 psError(PS_ERR_UNKNOWN, true, "Can not create output files, so why continue!?"); 549 return 1; 550 } 551 552 psFits* fTruthFile = psFitsAlloc("verified/fOut.fits"); 553 psFits* sTruthFile = psFitsAlloc("verified/sOut.fits"); 554 psFits* fBiTruthFile = psFitsAlloc("verified/fBiOut.fits"); 555 psFits* sBiTruthFile = psFitsAlloc("verified/sBiOut.fits"); 556 if (fTruthFile == NULL ||sTruthFile == NULL || fBiTruthFile == NULL || sBiTruthFile == NULL) { 557 psError(PS_ERR_UNKNOWN, true, "Can not open truth files, so why continue!?"); 558 return 1; 559 } 560 561 char hduName[80]; 562 psRegion regionAll = psRegionSet(0,0,0,0); 552 563 for (psS32 rot=-180;rot<=180;rot+=45) { 553 564 psImage* oldOut = fOut; 554 565 psImage* oldBiOut = fBiOut; 555 566 snprintf(hduName, 80, "%+d", rot); 556 567 if (rot == 90) { 557 568 radianRot = M_PI_2; … … 578 589 sOut = psImageRotate(sOut,sImg,radianRot,-1.0,PS_INTERPOLATE_FLAT); 579 590 sBiOut = psImageRotate(sBiOut,sImg,radianRot,-1.0,PS_INTERPOLATE_BILINEAR); 580 if (! psImageWriteSection(fOut,0,0,0,NULL,index,"temp/fOut.fits") ) { 581 psError(PS_ERR_UNKNOWN, true,"Can not write to temp/fOut.fits, so why continue!?"); 591 592 if (! psFitsWriteImage(fOutFile, NULL, fOut, 1, hduName) ) { 593 psError(PS_ERR_UNKNOWN, true,"Can not write fOut."); 582 594 return 20; 583 595 } 584 if (! ps ImageWriteSection(sOut,0,0,0,NULL,index,"temp/sOut.fits") ) {585 psError(PS_ERR_UNKNOWN, true,"Can not write to temp/sOut.fits, so why continue!?");596 if (! psFitsWriteImage(sOutFile, NULL, sOut, 1, hduName) ) { 597 psError(PS_ERR_UNKNOWN, true,"Can not write sOut."); 586 598 return 21; 587 599 } 588 if (! ps ImageWriteSection(fBiOut,0,0,0,NULL,index,"temp/fBiOut.fits") ) {589 psError(PS_ERR_UNKNOWN, true,"Can not write to temp/fBiOut.fits, so why continue!?");600 if (! psFitsWriteImage(fBiOutFile, NULL, fBiOut, 1, hduName) ) { 601 psError(PS_ERR_UNKNOWN, true,"Can not write fBiOut.fits."); 590 602 return 40; 591 603 } 592 if (! ps ImageWriteSection(sBiOut,0,0,0,NULL,index,"temp/sBiOut.fits") ) {593 psError(PS_ERR_UNKNOWN, true,"Can not write to temp/sBiOut.fits, so why continue!?");604 if (! psFitsWriteImage(sBiOutFile, NULL, sBiOut, 1, hduName) ) { 605 psError(PS_ERR_UNKNOWN, true,"Can not write sBiOut.fits."); 594 606 return 41; 595 607 } 596 608 597 609 // now, let's compare this with the verified file 598 fTruth = psImageReadSection(fTruth,0,0,0,0,0,NULL,index,"temp/fOut.fits"); 599 sTruth = psImageReadSection(sTruth,0,0,0,0,0,NULL,index,"temp/sOut.fits"); 600 fBiTruth = psImageReadSection(fBiTruth,0,0,0,0,0,NULL,index,"temp/fBiOut.fits"); 601 sBiTruth = psImageReadSection(sBiTruth,0,0,0,0,0,NULL,index,"temp/sBiOut.fits"); 610 psFitsMoveExtNum(fTruthFile, index, false); 611 psFitsMoveExtNum(sTruthFile, index, false); 612 psFitsMoveExtNum(fBiTruthFile, index, false); 613 psFitsMoveExtNum(sBiTruthFile, index, false); 614 fTruth = psFitsReadImage(fTruth, fTruthFile, regionAll, 0); 615 sTruth = psFitsReadImage(sTruth, sTruthFile, regionAll, 0); 616 fBiTruth = psFitsReadImage(fBiTruth, fBiTruthFile, regionAll, 0); 617 sBiTruth = psFitsReadImage(sBiTruth, sBiTruthFile, regionAll, 0); 602 618 if (fTruth == NULL) { 603 619 psError(PS_ERR_UNKNOWN, true,"verified psF32 image failed to be read (%d deg. rotation)", … … 743 759 psFree(fBiOut); 744 760 761 psFree(fOutFile); 762 psFree(sOutFile); 763 psFree(fBiOutFile); 764 psFree(sBiOutFile); 765 766 psFree(fTruthFile); 767 psFree(sTruthFile); 768 psFree(fBiTruthFile); 769 psFree(sBiTruthFile); 770 745 771 return 0; 746 772 } -
trunk/psLib/test/image/verified/tst_psImageGeomManip.stderr
r3976 r4128 57 57 \**********************************************************************************/ 58 58 59 <DATE><TIME>|<HOST>|W|psImageWriteSection60 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.61 <DATE><TIME>|<HOST>|W|psImageWriteSection62 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.63 <DATE><TIME>|<HOST>|W|psImageWriteSection64 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.65 <DATE><TIME>|<HOST>|W|psImageWriteSection66 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.67 <DATE><TIME>|<HOST>|W|psImageReadSection68 psImageReadSection is deprecated. Consider using psFitsReadImage instead.69 <DATE><TIME>|<HOST>|W|psImageReadSection70 psImageReadSection is deprecated. Consider using psFitsReadImage instead.71 <DATE><TIME>|<HOST>|W|psImageReadSection72 psImageReadSection is deprecated. Consider using psFitsReadImage instead.73 <DATE><TIME>|<HOST>|W|psImageReadSection74 psImageReadSection is deprecated. Consider using psFitsReadImage instead.75 <DATE><TIME>|<HOST>|W|psImageWriteSection76 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.77 <DATE><TIME>|<HOST>|W|psImageWriteSection78 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.79 <DATE><TIME>|<HOST>|W|psImageWriteSection80 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.81 <DATE><TIME>|<HOST>|W|psImageWriteSection82 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.83 <DATE><TIME>|<HOST>|W|psImageReadSection84 psImageReadSection is deprecated. Consider using psFitsReadImage instead.85 <DATE><TIME>|<HOST>|W|psImageReadSection86 psImageReadSection is deprecated. Consider using psFitsReadImage instead.87 <DATE><TIME>|<HOST>|W|psImageReadSection88 psImageReadSection is deprecated. Consider using psFitsReadImage instead.89 <DATE><TIME>|<HOST>|W|psImageReadSection90 psImageReadSection is deprecated. Consider using psFitsReadImage instead.91 <DATE><TIME>|<HOST>|W|psImageWriteSection92 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.93 <DATE><TIME>|<HOST>|W|psImageWriteSection94 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.95 <DATE><TIME>|<HOST>|W|psImageWriteSection96 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.97 <DATE><TIME>|<HOST>|W|psImageWriteSection98 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.99 <DATE><TIME>|<HOST>|W|psImageReadSection100 psImageReadSection is deprecated. Consider using psFitsReadImage instead.101 <DATE><TIME>|<HOST>|W|psImageReadSection102 psImageReadSection is deprecated. Consider using psFitsReadImage instead.103 <DATE><TIME>|<HOST>|W|psImageReadSection104 psImageReadSection is deprecated. Consider using psFitsReadImage instead.105 <DATE><TIME>|<HOST>|W|psImageReadSection106 psImageReadSection is deprecated. Consider using psFitsReadImage instead.107 <DATE><TIME>|<HOST>|W|psImageWriteSection108 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.109 <DATE><TIME>|<HOST>|W|psImageWriteSection110 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.111 <DATE><TIME>|<HOST>|W|psImageWriteSection112 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.113 <DATE><TIME>|<HOST>|W|psImageWriteSection114 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.115 <DATE><TIME>|<HOST>|W|psImageReadSection116 psImageReadSection is deprecated. Consider using psFitsReadImage instead.117 <DATE><TIME>|<HOST>|W|psImageReadSection118 psImageReadSection is deprecated. Consider using psFitsReadImage instead.119 <DATE><TIME>|<HOST>|W|psImageReadSection120 psImageReadSection is deprecated. Consider using psFitsReadImage instead.121 <DATE><TIME>|<HOST>|W|psImageReadSection122 psImageReadSection is deprecated. Consider using psFitsReadImage instead.123 <DATE><TIME>|<HOST>|W|psImageWriteSection124 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.125 <DATE><TIME>|<HOST>|W|psImageWriteSection126 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.127 <DATE><TIME>|<HOST>|W|psImageWriteSection128 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.129 <DATE><TIME>|<HOST>|W|psImageWriteSection130 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.131 <DATE><TIME>|<HOST>|W|psImageReadSection132 psImageReadSection is deprecated. Consider using psFitsReadImage instead.133 <DATE><TIME>|<HOST>|W|psImageReadSection134 psImageReadSection is deprecated. Consider using psFitsReadImage instead.135 <DATE><TIME>|<HOST>|W|psImageReadSection136 psImageReadSection is deprecated. Consider using psFitsReadImage instead.137 <DATE><TIME>|<HOST>|W|psImageReadSection138 psImageReadSection is deprecated. Consider using psFitsReadImage instead.139 <DATE><TIME>|<HOST>|W|psImageWriteSection140 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.141 <DATE><TIME>|<HOST>|W|psImageWriteSection142 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.143 <DATE><TIME>|<HOST>|W|psImageWriteSection144 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.145 <DATE><TIME>|<HOST>|W|psImageWriteSection146 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.147 <DATE><TIME>|<HOST>|W|psImageReadSection148 psImageReadSection is deprecated. Consider using psFitsReadImage instead.149 <DATE><TIME>|<HOST>|W|psImageReadSection150 psImageReadSection is deprecated. Consider using psFitsReadImage instead.151 <DATE><TIME>|<HOST>|W|psImageReadSection152 psImageReadSection is deprecated. Consider using psFitsReadImage instead.153 <DATE><TIME>|<HOST>|W|psImageReadSection154 psImageReadSection is deprecated. Consider using psFitsReadImage instead.155 <DATE><TIME>|<HOST>|W|psImageWriteSection156 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.157 <DATE><TIME>|<HOST>|W|psImageWriteSection158 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.159 <DATE><TIME>|<HOST>|W|psImageWriteSection160 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.161 <DATE><TIME>|<HOST>|W|psImageWriteSection162 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.163 <DATE><TIME>|<HOST>|W|psImageReadSection164 psImageReadSection is deprecated. Consider using psFitsReadImage instead.165 <DATE><TIME>|<HOST>|W|psImageReadSection166 psImageReadSection is deprecated. Consider using psFitsReadImage instead.167 <DATE><TIME>|<HOST>|W|psImageReadSection168 psImageReadSection is deprecated. Consider using psFitsReadImage instead.169 <DATE><TIME>|<HOST>|W|psImageReadSection170 psImageReadSection is deprecated. Consider using psFitsReadImage instead.171 <DATE><TIME>|<HOST>|W|psImageWriteSection172 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.173 <DATE><TIME>|<HOST>|W|psImageWriteSection174 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.175 <DATE><TIME>|<HOST>|W|psImageWriteSection176 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.177 <DATE><TIME>|<HOST>|W|psImageWriteSection178 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.179 <DATE><TIME>|<HOST>|W|psImageReadSection180 psImageReadSection is deprecated. Consider using psFitsReadImage instead.181 <DATE><TIME>|<HOST>|W|psImageReadSection182 psImageReadSection is deprecated. Consider using psFitsReadImage instead.183 <DATE><TIME>|<HOST>|W|psImageReadSection184 psImageReadSection is deprecated. Consider using psFitsReadImage instead.185 <DATE><TIME>|<HOST>|W|psImageReadSection186 psImageReadSection is deprecated. Consider using psFitsReadImage instead.187 <DATE><TIME>|<HOST>|W|psImageWriteSection188 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.189 <DATE><TIME>|<HOST>|W|psImageWriteSection190 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.191 <DATE><TIME>|<HOST>|W|psImageWriteSection192 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.193 <DATE><TIME>|<HOST>|W|psImageWriteSection194 psImageWriteSection is deprecated. Consider using psFitsWriteImage instead.195 <DATE><TIME>|<HOST>|W|psImageReadSection196 psImageReadSection is deprecated. Consider using psFitsReadImage instead.197 <DATE><TIME>|<HOST>|W|psImageReadSection198 psImageReadSection is deprecated. Consider using psFitsReadImage instead.199 <DATE><TIME>|<HOST>|W|psImageReadSection200 psImageReadSection is deprecated. Consider using psFitsReadImage instead.201 <DATE><TIME>|<HOST>|W|psImageReadSection202 psImageReadSection is deprecated. Consider using psFitsReadImage instead.203 59 <DATE><TIME>|<HOST>|I|testImageRotate 204 60 Following should be an error
Note:
See TracChangeset
for help on using the changeset viewer.
